WIP: Random 2.0 fixes

Casting a wide net and finding spelling and other mistakes