Updated javadoc and README updates