Misc fixes

typos and booboos from refactoring