Bug fixed and add some features