Javadoc added plus some comment fixes