Updated Javadoc. Should be finished.