Spurious spaces in .aux
Small refortmatting
More formatting fixes
More format tweaking
Merge branch 'dev' into ms