trailing whitespace fixes, etc