Fixing more typos and a few more edits