reorg todo and minor text changes
bugfix in handling connect failed and lost