Some more cleanup from the big refactor

Should fix the manual on/off switch and also adds a simple method to check if the service is running from the client side.