Fixed tense
various fixes