some whitespace changes

Whitespace changes and small fixes. TBR