fixed typos and makede first round of revisions
Merge branch 'staging'