add dumpsetup option; refactor