more changes
Merge pull request #347 from SingularityGuy/fixing-errors

more changes