some model fixes