dump: attribute that which needs attributing and clean up a bit