improvement in javadoc
do some TODOs