* cleanup and add enum

* new type working

* enum works

* use type enum

* cleanup

* fix errant past to source file

* fix type

* safely construct the type map

* fix get_type_info_map return type