reworked some code in engagement tool
various updates and bug fixes
Merge branch 'master' into d3test
Merge branch 'd3test' of github.com:weareytm/Ragnarok into d3test