Updating datacollection services and other small changes
Merge pull request #3 from CCoffie/master

Updating datacollection services and other small changes