fixing up for both heroku and github deploy and rework of codelab