Lot of grammar fixes