Make Installer a service. small cleanups