more typos
merged