Fix javadoc on Java 8 and some small style fixes.