fix JAVA_HOME
move stuff around a bit
unexpected merge