Add description for contenttypes, did some cleanup. Fixes #847