Fixes bug whereby handlers were improperly handled. Also brings config into sync with current framework.