fixed up a few more typos in the refactoring