Better spacing
Misc fixes
Merge branch 'june-wip'