tmp fix timeout
file edit: fix some bugs