minor updates, added javadoc
remove println statements