modify some bug ... however there didn't still fix all