merge part of the wdm changes. Mostly formatting and adding a few definitions.