whitespace fixes and other minor things