TYPEs are now just ID
minor
unify methods and functions