Final debug and Javadoc update