fixed minor changes
merge