cleaned up listeners
trying to fix unexpected terminator bug...dafuq