Mostly just upper-casing grant type names

Mostly just uppercasing grant type names for consistency (I've been uppercasing the names when we refer directly to a grant type.  It's just a matter of preference).

Reworded a few things.  That's about it.