Finished collector -> service porting, small docs cleanups