Minor Fixes

A few issues were found and addressed, one of which was breaking the game entirely, so hopefully it's all good now.
If any more are found, please let me know, and I'll fix it as soon as I can.