some fix from China site
fix bugs