fix/add javadoc comments