Flesh out descriptions a bit more.
More logical type check.
Fix includes due to renaming.
Merge pull request #1 from adam-vessey/7.x

Description and extendability improvements.