7.x grammar fixes

Expanded a few things out. Removed a bunch of question marks as well.