Minor changes in server overworld

Just doing this commit so I can grab the latest changes before
integrating my code