fixing some model stuff