Close Connection / added TODO