minor changes to world classes