cleanup and changes for easy heroku deployment