Fixing Service Provider bug.

Also tidying up the providers config file.