Continued work on Services

Started some work on javadocs.  This should be continued when I go to
update other classes.