javadoc changes and few minor tweaks.