fixed routes, cleaned up some elements