Cleaning up a few things

To prep for better world gen aaand players!