minor updates and added jdoc comments