messed up some stuff...
some more stuff I forgot
completed TypeInfo abstraction stuff..