World Gen modifications + crash handling