new wish list
Fix wrong import
fix rawtypes for AbstractListenerService
expose registered listeners
Minor cleanup