java issues fixed i think