update TODO and fix reconnect