Fixed errors
Merge pull request #1 from geoand/master

All errors nearly fixed; A little house cleaning to do still