bunch of grammar improvements