another round of edits
additional edits
fixed site cat
Merge pull request #396 from optimizely/ctiutan/sept18branch

another round of edits