fixed routes
comments are working
merge commit