First pass to clean up config and fix multi serivce instance bug