Negative listeners should be added immediately
A few minor edits