These patches are a series of improvements to the "wdp" branch. They are a step toward making "wdp" as capable as "master". There will more steps after these--I have another patch in preparation--but I will be away all next week so I want to make sure that what I have is out there for people to look at.