v4.0.1

Numerous minimal adjustments. just uploading before I get to work on
v4.0.2 which will fix Data Values.