refactoring and more warnings from TypeCatalogue #261

Merged
merged 7 commits into from Mar 2, 2014