small model improvements