Added JAVA_HOME etc. plus tweaked other path stuff