Bug Fixes (Again!)

While I was making the last bug fix, my friend somehow broke it, so I fixed the bugs!

If there is more, then it'll unfortunately stay that way!