fix some bugs and some pics