fixed all and add java