fix some bugs
merge and add nearby