Aesthetic changes

Changed some minor details and added comments. Basicaly, this is a more
recent version of the file that Andrea got ahold of.