fixed / added javadoc comments