Grammar and other fixes