Minor orthographic fixes
Finished merge