fixes on model