fixing some Model issues