Seperating listeners from manager and other fixes, refactorings...