added JavaDocs to Service
some fixes