Fix bugs 9-17 Huanbaoju update