some fixes to World class