Lot of changes and Javadoc