minor changes to listeners