Comments and messages.
Removes listen_test, just using listen.