fix some errors in Xclone.java and other files