More granular dumping. Needs more though.
Cleanup. Hopefully works now.