Update

Update to Java 8, fixing little issues, cleaning up code.