Java 1.7

Java 1.7 + code updates (mostly useless)