More fixes
Merge pull request #25 from HackSocNotts/dev

More fixes