MOD:fix two bugs and fix 3 features