some minor changes
something
merge