fix some bugs in the afternoon