TypeRef subtypes processing added
fix conflict
type printing fixes