First part of fixes due to grammar/spell checking