minor whitespace fixes and simple fix