some cleanups
ASCII datafile / extrapvs now more XDI-like
ASCII datafile / extrapvs now more XDI-like