change several methods on BaseWorld and some Entities.