added world, changed combat and items