Whitespace fixes and minor updates