Add some comments to test_listener, and make some trivial other edits