Add more services and general fixes

Along with more "override" in the service's headers.
Edit: Removed any license changes