Finetune
update and cleanup
Add heroku config util