improving the dump tool for diagnostics