Updates for Java 1.7 features, and modified settings again.