switches Mdogo_Broker to MdogoClosure, tweaks both