fixed and add java
fixed all