fixed models a bit more