MQTT Performance improvements, Attending to TODOs