Add some javadoc and improve a toString.