Some fixing to allow for infinite worlds.
Infinite worlds!