comments, and some gevent cleanup