fix listeners and add service start/stop