Fix dumping and make it more verbose