updated controllers, edited routes