Fixed some typoes
Merged with Neha's changes on different files