connection correction plus todo comments