update 2.1 12/5 - Javadoc started