fixed most of the errors.
Merge pull request #1 from DavidtheCreator/master

Error fix #1 is confirmed.
- David