Added JAVA stuff and other minor stuff