dump and fixes