Fixed up the listener stuff