Added some trappings and corrected some indentions
Added a new version of the program