clear the empty folder and fix some bugs

燕艳干的不错。。。。辛苦辛苦