fix some bugs
fat commit