fixed the to_s method - call it on an instance not the class AND correctly remap classes when set.
Merge branch 'type-support' to incorporate fixes.