Whitespace fixes
Meh. add most metadata for real now..