Fixes

Fixes: 
* Manly typos 
* Also few semantic fixes here and there.

Please do a peer review and then merge if it looks OK.

Thanks