Add all components to discovery service.  Add status util.
Cleanup and various fixes.