Fixing more typos and reorganizing sections