Fixed all those pesky crashes and errors
Merge pull request #1 from Rekkyn/master

Fixed all those pesky crashes and errors