fixed some bugs and add webster