Switch to listen and add some additional enforcing of help detection