Change more service descriptions. Fixes #2
Merge remote-tracking branch 'upstream/dev'