Fixing silly bugs and rounding out the type registry functionality a
bit more
delete test file