Merge in a bunch of updates from fly-man

Updates from Fly-man

- Prebuild change
- WDNE Cleanup