fix some stuff with the models