And fixing more typos