Merging in minor comments