generator and typesystem updates