Fixed some routing problems and problems deploying to heroku