further paper polishing (incl. code indenting etc)