fixed donnelly
fixes to donnelly and vitter_cowan