fixes

Fixed some things
Merge pull request #1 from Superbunnygirl/patch-1

fixes