bug fix and added the java handling script