Javadoc done!
Minor changes
minor changes