major improvements, world bug fixes