config refactored and tested
removed unnecessary callbacks
merge