Tried to solve the ConcurrentModificationExceptions
Fixed a lot of the JavaDocs to be able to build with JDK 8