fix small bugs
merge
change data