v4.0

Shantanu, work from these, maybe merge with changes from yours.  I will
send you an email indicating what is in the print data