some typos fixed
Merged typos and current upstream master