expanded types model

removed debugging lines