Add more services and some fixes, along with more "override"
in the service's headers
Merge pull request #190 from purpasmart96/more_services

Add more services and general fixes