fix some bugs
Almost Testing