more updates and moving javas around