fixed javadoc and added TODO