maximum grammar cleanup.

there were so many fuckin errors
fixes merge conflict

title