cleanup, structure work, dump added