Various changes to Java values and Javascript