Whitespace fixes, minor changes.