xz: some edits from ca1ne