CostMapCapabilities as well as a few other changes in descriptions