Update to Java 7; using jnlp file choosers; many tweaks