Update grammar and consistency 

tried doing it directly here on github. Lets see.