Final edits for v1 and ready for heroku