javadocs, todos added