minor update to fix some todos and wrong javadoc