add more features and fixed some bugs
fixed a bug