Documents metadatatool and includes a couple other minor changes.