Bug Fixes, World.cpp