updated java versions, fixed couple of things