fixing ExprModel2 and override defs, removing debug prints