Fixed a bunch of typos, integrated some suggestions from Scott