Fixed some typos 

up to you :D
merge Andrea's patch