minor updates
merge