Add temp debug code

Tweak WMI signature generation code
Formatting cleanup