Changes for issue 3659 ( the simple stuff )
And the mistakes I saw when I looked.
Fix English
Add the headers and the footers etc
Merge pull request #1254 from zz9pzza/issue_3545

Issue 3545