modifid some bugs
merge