Merge pull request #1 from Carlgo11/master

DONT MERGE KTHXBYE
hopefully fixed

meow
Derpy

Fixed some stuff that I derped on
Merge pull request #2 from tryy3/master

Small changes