Fixes additional config includes, manages as a service, and a few bugfixes