Flesh out descriptions a bit more.
More logical type check.
Fix includes due to renaming.