Service Listener/Monitors and minor fixes