Changes to lots of files
Changes to partial files
Changes for various things
Merge pull request #178 from findsorguk/fixingProblems

Fixing problems