W Fixed dumping

Dumping is now much more reliable, and in my opinion, a finished product