Merge Dave's stuff
Fixup wro paths