fixed models, working on admin