Added code to some service functions (some untested), fixed
declaration of service main function.

3 files changed