More grammar and style fixes