Changes for issue 3659 ( the simple stuff )
And the mistakes I saw when I looked.
Fix English