Updateed CUPS handling with the new service name, fixed a small bug.