fixes for listeners and other stuff