minor updates
merges