minor changes to listener responses