minor
small changes
merge