add exchanges, mutators, handler cleanup
Merge pull request #39 from jlambert121/handlers_update

add exchanges, mutators, handler cleanup