april1214_ver1.01 Some fixes