Some rewording and fixes