Few fixes for errors
Few fixes for errors - more tomorrow
Fixed some bugs
Merge pull request #174 from findsorguk/fixingProblems

Fixing problems