small tweaks and whitespace fixes