Minor content changes
fixed merge