v2.0 fix bugs in others