some model improvements