Alright, modifications complete! Happy reading.

@Oto Did you read Amaya's CS?