Add more services and some fixes, along with more "override" in the service's headers