Walter Harms added -D to date, and I did a code cleanup while I was in the