added java, corrected osx settings