fixing models and routes