some minor changes
merge