Keep all locations in the _entities dict
Made World.on_draw() check for None. Fixed formatting