fixed startup, and Stop/Restart issues