Tweak and hack
Dependences, getting ready for Heroku