Minor bug changes to game world
Fixing conflicts