moved two more dump()s to closure, saving 2/3rd of memory and some CPU time on