Misc fixes

typos and stuff