Javadocs fixed. TODO uipdated.