added javadoc to finish all todos