removed some more trailing whitespace
shuffle comments around + some other changes
changes in comments