Fixed:
1. Fix some bugs