Spacing changes; Syntax fixes

Nothing of consequence