minor cleanup, added JAVA_HOME