updated javadoc and README