fixed some tenses
Merge branch 'upstream/master'