Heroku
Heroku fixes
core.js rewrite