small bugs modification
merge