Tidy up files a little bit.
Merge remote-tracking branch 'origin/master'
Solved a few more with work in progress.