Some improvements to Aro's code

No description (lazy moment)