Tweaks and whitespace fixes.