Whitespace changes, push TODOs for tom. morning