javadoc fixes and small iterator bugfix