minor - wanted to clean up the dvec/civec mess, but did not go well. Will try again