Rewrote some javadoc