Fixed more bugs (P.S. This is a bad commit message, since it so undetailed, but we are noobs so oh well.)
Merge pull request #3 from TheKing42/bugFix2

Fixed more bugs (P.S. This is a bad commit message, since it so undetail...