fixed typos
merged