some minor fixes, ready to deploy to heroku