[#79692868] tweaks and fixes

just getting it working with a wercker app
some renames and functionality modifications