redone some stuff after trashing heroku app