Tweaked public API and updated javadocs
Tweaked public API and updated javadocs