Documentation touchups
Clearing up some todos
Filled in ServiceAnalysis tests
Filled in ActivityAnalysis tests
Fixed a couple of minor todos