some more model improvements