listening fixes