Updating for Java 8, cosmetic fixes