Fixed typos, some more cleanup