fixed name and some bugs