adjusting model and fixing routes