clean up, comments, testing: connection stable