routes/controllers fixed