Cleanup: updating java version to 1.7, fixing minor stuff in js