Added some internal blocks

Cleaned up some debug output
Tried to speed up WGen by making it more concurrent.  It kinda helps