Cavebound: More bug fixes

Fixed even more bugs (my friend found some lol)