Fix dump
Fix some javadocs.