cleanup
added more complete dumping of metadata.