Fixing the world class and adding terrain