Whitespace and some other fixes.