Lots of controller updates
Updates for file paths etc
Merge pull request #172 from findsorguk/fixingProblems

Fixing problems