fixed lots of typo-ish bugs