Minor javadoc
Fix up examples
Fix concurrent modification exception