Clean up matching type setup
Add rudimentary search for windows registry keys