Several minor fixes and improvements

Hello!

I just worked on several minor fixes based on the reports from the player Fluffie the sock. Thanks!

Sincerely,
Bone Collectors.