adding javadoc and knocking out todo