Added more dumps and fixes.