Tweaks including mapping D - vs to \overline{vs}