Attempts to fix minor formatting glitches
Merge changes forward