7.x grammar and clarity fixes