All javadoc updated plus come minor changes