Little changes and Javadoc comments added