update some features and fixed some bug