Fixed alot of stuff that I don't remember.
Merge pull request #3 from ajpoinsatte/Testing

Fixed alot of stuff that I don't remember.