Editing more typos, and a couple field name errors