Fix some markup errors + add heroku support