fix: windows build: -mwindows in LDFLAGS instead of CLFAGS

bump to patchlevel 9
chore: update locales
2021-06-28 22:43:41 +02:00 · 2021-06-28 22:08:51 +02:00 · 2021-06-28 22:08:51 +02:00 · 2021-06-28 22:08:51 +02:00 · 2021-06-28 22:08:51 +02:00 · 2021-06-27 21:04:23 +02:00
182 changed files with 247865 additions and 6341 deletions
--- a/.github/workflows/make-dist.sh
+++ b/.github/workflows/make-dist.sh
@@ -28,9 +28,9 @@ mkdir -p dist/locale
 cp -vr locale/*/ dist/locale/
 if [ "$os" != "linux64" ]; then
  if [ "$GUI" = 1 ]; then
-    mkdir -p dist/share/themes
+    mkdir -p dist/share/themes dist/lib/gtk-2.0
    cp -vr $MINGW_PREFIX/share/themes/MS-Windows dist/share/themes/
-    cp -vr $MINGW_PREFIX/lib/gtk-2.0 dist/lib/
+    cp -vr $MINGW_PREFIX/lib/gtk-2.0/* dist/lib/gtk-2.0/
    rm -rf dist/lib/gtk-2.0/include
  fi
  mkdir -p dist/lib
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
            msystem: MINGW32
            grep: 386
          - ui: cli
-            clionly: 1
+            clionly: --with-cli-only
    defaults:
      run:
        shell: msys2 {0}
@@ -37,9 +37,7 @@ jobs:
      shell: bash
    - uses: actions/checkout@v2
    - name: configure
-      env:
-        CLI_ONLY: ${{ matrix.clionly }}
-      run: ./configure
+      run: ./configure ${{ matrix.clionly }}
    - name: make
      run: nproc && make -j$(nproc)
    - name: check executable
@@ -80,7 +78,7 @@ jobs:
    - name: install prerequisites
      run: sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man
    - name: configure
-      run: env CLI_ONLY=1 ./configure
+      run: ./configure --with-cli-only
    - name: make
      run: nproc && make -j$(nproc) && make static && mv -f dvdisaster-static dvdisaster
    - name: check executable
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,185 +3,114 @@ name: non-regression tests
 on: [pull_request]

 jobs:
-
-  win64-gui:
+  win:
    runs-on: windows-2016
+    strategy:
+      matrix:
+        arch: [x86_64, i686]
+        ui: [cli, gui]
+        printf: [fmtdbg, normal]
+        include:
+          - arch: x86_64
+            msystem: MINGW64
+            grep: x86-64
+          - arch: i686
+            msystem: MINGW32
+            grep: 386
+          - ui: cli
+            clionly: --with-cli-only
+          - printf: fmtdbg
+            debugprintf: --with-debug-printf-format
    defaults:
      run:
        shell: msys2 {0}
    steps:
    - uses: msys2/setup-msys2@v2
      with:
-        msystem: MINGW64
+        msystem: ${{ matrix.msystem }}
        update: false
-        install: git diffutils make pkg-config mingw-w64-x86_64-gtk2 mingw-w64-x86_64-glib2 mingw-w64-x86_64-gcc mingw-w64-x86_64-ghostscript mingw-w64-x86_64-jq mingw-w64-x86_64-ntldd-git man zip
-    - run: git config --global core.autocrlf input
+        install: git diffutils make pkg-config mingw-w64-${{ matrix.arch }}-glib2 mingw-w64-${{ matrix.arch }}-gcc mingw-w64-${{ matrix.arch }}-ghostscript mingw-w64-${{ matrix.arch }}-ntldd-git man zip
+    - name: install GUI prereqs
+      if: matrix.ui == 'gui'
+      run: pacman -S --noconfirm mingw-w64-${{ matrix.arch }}-gtk2
+    - name: git config
+      run: git config --global core.autocrlf input
      shell: bash
    - uses: actions/checkout@v2
    - name: configure
-      run: ./configure
+      run: |
+          echo running ./configure ${{ matrix.clionly }} ${{ matrix.debugprintf }} --with-werror
+          ./configure ${{ matrix.clionly }} ${{ matrix.debugprintf }}    --with-werror
    - name: make
      run: nproc && make -j$(nproc)
    - name: check executable
      run: |
          ./dvdisaster.exe --version
          file dvdisaster.exe
-          ./dvdisaster.exe --version | grep -q -e dirty -e NOGUI && exit 1
-          file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
-    - name: prepare dist
-      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
-      id: dist
-    - name: check executability of dist from cmd.exe
-      shell: cmd
-      run: |
-          cd dist
-          dvdisaster.exe --version
-    - name: regression tests
-      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
-
-  win32-gui:
-    runs-on: windows-2016
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW32
-        update: false
-        install: git diffutils make pkg-config mingw-w64-i686-gtk2 mingw-w64-i686-glib2 mingw-w64-i686-gcc mingw-w64-i686-ghostscript mingw-w64-i686-jq mingw-w64-i686-ntldd-git man zip
-    - run: git config --global core.autocrlf input
-      shell: bash
-    - uses: actions/checkout@v2
-    - name: configure
-      run: ./configure
-    - name: make
-      run: nproc && make -j$(nproc)
-    - name: check executable
+          if ./dvdisaster.exe --version | grep dirty; then exit 1; fi
+          file dvdisaster.exe | grep -q '${{ matrix.grep }}, for MS Windows'
+    - name: check executable (GUI)
+      if: matrix.ui == 'gui'
      run: |
          ./dvdisaster.exe --version
-          file dvdisaster.exe
-          ./dvdisaster.exe --version | grep -q -e dirty -e NOGUI && exit 1
-          file dvdisaster.exe | grep -q '386, for MS Windows'
-    - name: prepare dist
-      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
-      id: dist
-    - name: check executability of dist from cmd.exe
-      shell: cmd
-      run: |
-          cd dist
-          dvdisaster.exe --version
-    - name: regression tests
-      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
-
-  win64-cli:
-    runs-on: windows-2016
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW64
-        update: false
-        install: git diffutils make pkg-config mingw-w64-x86_64-glib2 mingw-w64-x86_64-gcc mingw-w64-x86_64-ghostscript mingw-w64-x86_64-jq mingw-w64-x86_64-ntldd-git man zip
-    - run: git config --global core.autocrlf input
-      shell: bash
-    - uses: actions/checkout@v2
-    - name: configure
-      run: env CLI_ONLY=1 ./configure
-    - name: make
-      run: nproc && make -j$(nproc)
-    - name: check executable
+          if ./dvdisaster.exe --version | grep NOGUI; then exit 1; fi
+    - name: check executable (CLI)
+      if: matrix.ui == 'cli'
      run: |
          ./dvdisaster.exe --version
-          file dvdisaster.exe
-          ./dvdisaster.exe --version | grep -q -e dirty && exit 1
-          ./dvdisaster.exe --version | grep -q NOGUI
-          file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
-    - name: prepare dist
+          ./dvdisaster.exe --version | grep NOGUI
+    - name: try to prepare dist
      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
-      id: dist
-    - name: check executability of dist from cmd.exe
-      shell: cmd
-      run: |
-          cd dist
-          dvdisaster.exe --version
-    - name: regression tests
-      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
+    - name: run regression tests
+      if: matrix.printf == 'normal'
+      env:
+        REGTEST_NO_UTF8: 1
+      run: mkdir /var/tmp/regtest && ./regtest/runtests.sh

-  win32-cli:
-    runs-on: windows-2016
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW32
-        update: false
-        install: git diffutils make pkg-config mingw-w64-i686-glib2 mingw-w64-i686-gcc mingw-w64-i686-ghostscript mingw-w64-i686-jq mingw-w64-i686-ntldd-git man zip
-    - run: git config --global core.autocrlf input
-      shell: bash
-    - uses: actions/checkout@v2
-    - name: configure
-      run: env CLI_ONLY=1 ./configure
-    - name: make
-      run: nproc && make -j$(nproc)
-    - name: check executable
-      run: |
-          ./dvdisaster.exe --version
-          file dvdisaster.exe
-          ./dvdisaster.exe --version | grep -q -e dirty && exit 1
-          ./dvdisaster.exe --version | grep -q NOGUI
-          file dvdisaster.exe | grep -q '386, for MS Windows'
-    - name: prepare dist
-      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
-      id: dist
-    - name: check executability of dist from cmd.exe
-      shell: cmd
-      run: |
-          cd dist
-          dvdisaster.exe --version
-    - name: regression tests
-      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
-
-  linux64-cli:
+  linux:
    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ui: [cli, gui]
+        printf: [fmtdbg, normal]
+        include:
+          - ui: cli
+            clionly: --with-cli-only
+          - printf: fmtdbg
+            debugprintf: --with-debug-printf-format
    steps:
    - uses: actions/checkout@v2
    - name: install prerequisites
-      run: sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man jq
+      env:
+        DEBIAN_FRONTEND: noninteractive
+      run: sudo apt-get update && sudo apt-get install -y libglib2.0-dev ghostscript man jq
+    - name: install prerequisites (GUI)
+      if: matrix.ui == 'gui'
+      env:
+        DEBIAN_FRONTEND: noninteractive
+      run: sudo apt-get install -y libgtk2.0-dev
    - name: configure
-      run: env CLI_ONLY=1 ./configure
+      run: |
+          echo ./configure ${{ matrix.clionly }} ${{ matrix.debugprintf }} --with-werror
+          ./configure ${{ matrix.clionly }} ${{ matrix.debugprintf }} --with-werror
    - name: make
      run: nproc && make -j$(nproc)
    - name: check executability
      run: ./dvdisaster --version
-    - name: check executable
-      run: file dvdisaster && file dvdisaster | grep -q 'ELF 64'
+    - name: check executable (GUI)
+      if: matrix.ui == 'gui'
+      run: |
+          ./dvdisaster --version
+          if ./dvdisaster --version | grep NOGUI; then exit 1; fi
+    - name: check executable (CLI)
+      if: matrix.ui == 'cli'
+      run: |
+          ./dvdisaster --version
+          ./dvdisaster --version | grep NOGUI
    - name: prepare dist
      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
    - name: regression tests
-      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
-
-  linux64-gui:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: install prerequisites
-      run: sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man jq libgtk2.0-dev
-    - name: configure
-      run: ./configure
-    - name: make
-      run: nproc && make -j$(nproc)
-    - name: check executability
-      run: ./dvdisaster --version
-    - name: check executable
-      run: file dvdisaster && file dvdisaster | grep -q 'ELF 64'
-    - name: prepare dist
-      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
-    - name: regression tests
-      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
-
+      if: matrix.printf == 'normal'
+      env:
+        REGTEST_NO_UTF8: 1
+      run: mkdir /var/tmp/regtest && ./regtest/runtests.sh
--- a/43
+++ b/43
@@ -1,11 +1,44 @@
 # dvdisaster changelog -*-text-*-

+0.79.6.patchlevel-9 27-06-2021 *UNOFFICIAL*
+- fix: using --strip in console without X server would segfault at program exit
+- enh: windows: hide useless background console
+- enh: linear read: log amount of correctly read sectors during a sesssion
+- enh: log window: use a bigger scrollback buffer
+- doc: regenerate codecs.pdf to get proper page numbers
+- chore: fix codec-specs Makefile
+
+0.79.6.patchlevel-8 22-02-2021 *UNOFFICIAL*
+- enh: gui: medium-info: add an 'exhaustive search' when not enabled in options
+- enh: gui: prefs: add a visual cue of tooltips
+
+0.79.6.patchlevel-7 30-01-2021 *UNOFFICIAL*
+- feat: add a new button to remove ECC data from an iso ("strip"), restoring an ISO to its previous non-augmented state (option: -z/--strip)
+- enh: try harder to find RS02/RS03 sigs in non-exhaustive mode (#19)
+- enh: add --examine-rs0[23] in --debug mode for CLI, to force exhaustive search with --medium-info
+- enh: more logs around exhaustive RS03 search in verbose
+- fix: windows: get rid of the last few warnings, build with -Werror for releases
+- chore: update tests, locales & readme
+
+0.79.6.patchlevel-6 17-01-2021 *UNOFFICIAL*
+- fix: allow blank media in Preferences>Error correction>RS02>query medium (#19)
+- fix: tested compilation under clang, detected a reversed order or arguments in a call to memset(), fixed
+- fix: printf: added --with-debug-print-format configure option to permit compile-time detection of printf format errors:
+  - fixed some potentially severe ones
+  - replaced %ldd/%ld by PRId64 to remove warnings on all archs
+- fix: appimage: adjust docdir for help menu
+- chore: ensure configure works properly even if user adds -Werror to CFLAGS
+- chore: added --with-werror to configure
+- chore: replaced CLI_ONLY=1 by --with-cli-only in configure
+- chore: update locales
+- chore: debug printf format in GitHub actions tests
+
 0.79.6.patchlevel-5 12-01-2021 *UNOFFICIAL*
-fix: don't error on blank media in medium-info (#19), bug present upstream since 0.79.5
-fix: gui: fix the 'SetLabelText() failed' error caption on the medium-info window (#19), bug present upstream since 0.72.3
-fix: add CHANGELOG, TODO, CREDITS to dist for the Help menu
-chore: appimage: add missing gtk engines and adjust docdir for help menu
-chore: enhance packaging, update locales, changelog et al.
+- fix: don't error on blank media in medium-info (#19), bug present upstream since 0.79.5
+- fix: gui: fix the 'SetLabelText() failed' error caption on the medium-info window (#19), bug present upstream since 0.72.3
+- fix: add CHANGELOG, TODO, CREDITS to dist for the Help menu
+- chore: appimage: add missing gtk engines and adjust docdir for help menu
+- chore: enhance packaging, update locales, changelog et al.

 0.79.6.patchlevel-4 04-09-2020 *UNOFFICIAL*
 - feat: allow adaptive reading again*
--- a/GNUmakefile.template
+++ b/GNUmakefile.template
@@ -89,8 +89,12 @@ ${BUILDTMP}/build.o : src/build.c src/build.h
 	@echo "Compiling:" src/build.o
 	@$(CC) $(COPTS) -c src/build.c -o $@

+${BUILDTMP}/closure.o : src/closure.c src/inlined-icons.h
+	@echo "Compiling:" src/closure.c
+	@$(CC) $(COPTS) -c src/closure.c -o $@
+
 ${BUILDTMP}/icon-factory.o : src/icon-factory.c src/inlined-icons.h
-	@echo "Compiling:" src/icon-factory.o
+	@echo "Compiling:" src/icon-factory.c
 	@$(CC) $(COPTS) -c src/icon-factory.c -o $@

 # Building the dvdisaster binary
@@ -108,20 +112,28 @@ dvdisaster: $(ICONS) $(OFILES)
 	else $(MAKE) --no-print-directory -C locale; \
 	fi

-src/inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png
-	@gdk-pixbuf-csource --raw --name=dvdisaster_read     icons/read.png      >src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_create   icons/create.png   >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_scan     icons/scan.png     >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_fix      icons/fix.png      >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_verify   icons/verify.png   >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc icons/open-ecc.png >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_open_img icons/open-img.png >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_cd icons/cd.png >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_help icons/gtk-help.png >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_index icons/gtk-index.png >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit icons/gtk-quit.png >>src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop icons/gtk-stop.png >>src/inlined-icons.h
+# gdk-pixbuf-csource sometimes produces truncated output, so we have to ensure the output
+# is valid before appending it to inlined-icons.h:
+src/inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png icons/strip.png icons/open-ecc.png icons/open-img.png icons/cd.png icons/gtk-help.png icons/gtk-index.png icons/gtk-preferences.png icons/gtk-quit.png icons/gtk-stop.png icons/tooltip.png icons/nothing.png
+	@echo "Building:" src/inlined-icons.h
+	@rm -f src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_read            icons/read.png            >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_create          icons/create.png          >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_scan            icons/scan.png            >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_fix             icons/fix.png             >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_verify          icons/verify.png          >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_strip           icons/strip.png           >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc        icons/open-ecc.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_open_img        icons/open-img.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_cd              icons/cd.png              >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_help        icons/gtk-help.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_index       icons/gtk-index.png       >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit        icons/gtk-quit.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop        icons/gtk-stop.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_tooltip         icons/tooltip.png         >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_nothing         icons/nothing.png         >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@rm -f src/.icons.tmp

 $(BUILDTMP)/help-dialogs.o: src/help-dialogs.c simple-md5sum
 	@if test -e fingerprints.md5; \
@@ -167,6 +179,21 @@ manualclean:
 	@echo "Removing temporary user manual files... "
 	@$(MAKE) --no-print-directory -C documentation/user-manual clean

+manualarchclean:
+	@echo "Removing generated user manual files... "
+	@$(MAKE) --no-print-directory -C documentation/user-manual archclean
+
+codecs:
+	@echo "Producing codecs specification documentation... "
+	@$(MAKE) --no-print-directory -C documentation/codec-specs
+
+codecsclean:
+	@echo "Removing temporary codecs specification documentation files... "
+	@$(MAKE) --no-print-directory -C documentation/codec-specs clean
+
+codecsarchclean:
+	@echo "Removing generated codecs specification documentation files... "
+	@$(MAKE) --no-print-directory -C documentation/codec-specs archclean

 # Some usage info

@@ -179,6 +206,7 @@ help:
 	@echo
 	@echo "Documentation related:"
 	@echo "manual    - create the user manual (requires LaTeX)"
+	@echo "codecs    - create the codecs spec documentation (requires LaTeX)"
 	@echo 
 	@echo "Locale related:"
 	@echo "locale    - update locale files"
@@ -338,7 +366,7 @@ arch:	archclean build.h
 INSTALL: documentation/install.template
 	@sed "s/@@PKGNAME/$(PKGNAME)/" <documentation/install.template >INSTALL

-srcdist: INSTALL distclean manual manualclean
+srcdist: INSTALL distclean manual manualclean codecsclean
 	@cd .. ; tar -c -j -X $(PKGNAME)/NODIST -f $(TAR_PREFIX)/$(PKGNAME).tar.bz2 $(PKGNAME)
 	@cd .. ; gpg --homedir .gnupg --default-key 758BCC23 --detach-sign --output $(TAR_PREFIX)/$(PKGNAME).tar.bz2.gpg --armor $(TAR_PREFIX)/$(PKGNAME).tar.bz2 

--- a/2
+++ b/2
@@ -130,7 +130,7 @@ user@host> ./configure
 If you want to build a CLI-only version, which doesn't depend
 on the gtk2 libraries, you can run instead:

-user@host> CLI_ONLY=1 ./configure
+user@host> ./configure --with-cli-only

 The script will possibly print some errors about missing libraries.
 Type "configure --help" to learn about pointing configure 
--- a/5
+++ b/5
@@ -5,8 +5,9 @@
 all:
 	@echo
 	@echo "Please run \`./configure' first."
-	@echo "To build a CLI-only version,"
-	@echo "run \`CLI_ONLY=1 ./configure' instead."
+	@echo
+	@echo "To build a CLI-only version, run `./configure --with-cli-only'."
+	@echo
 	@echo "Note that dvdisaster requires GNU make to build."
 	@echo "Under non-Linux systems, it might be known as \`gmake'."
 	@echo
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# What is dvdisaster?
+# :cd: What is dvdisaster?

 **dvdisaster** provides additional [ECC](https://en.m.wikipedia.org/wiki/Error_correction_code) protection for optical media. If a medium gets damaged, dvdisaster can recover it as long as the amount of damage is smaller than the amount of ECC data you added to protect it.

@@ -6,50 +6,64 @@ It can loosely be compared to [.par2](https://en.m.wikipedia.org/wiki/Parchive)

 Please refer to the [PDF manual](documentation/user-manual/manual.pdf) for more information.

-# Unofficial version
+# :wrench: Unofficial version

 The last upstream version by Carsten Gnörlich is dated 2017, and could be found on the [official](https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/index.html) [website](https://web.archive.org/web/20180509154525/http://dvdisaster.org/en/index.html) which is [now](http://www.dvdisaster.net) [down](http://www.dvdisaster.org). The original source code [repository](https://sourceforge.net/projects/dvdisaster/files/dvdisaster) doesn't have it, but [Debian sources](https://sources.debian.org/src/dvdisaster/) does, thanks to the maintainer there.
 The original [README](README) has been left untouched in this repository.
 This version is built on top of the latest upstream version, with the following notable enhancements:

- Most Debian patches have been applied, those specific to Debian have been omitted
- Windows build supported again, it was dropped upstream a few versions back
- A CLI-only version, not depending on gtk (`CLI_ONLY=1 ./configure && make clean && make -j4`)
- Regression tests confirmed working on Linux64, Windows32 and Windows64, for normal and CLI-only builds
 - Added pre-defined sizes for BD-R Triple Layer (100GB), BD-R Quadruple Layer (128GB)
+- Added an option to use more space for ECC on BD-R
+- Windows build supported again (it was dropped upstream a few versions back)
+- A new CLI-only version, not depending on gtk (`./configure --with-cli-only && make clean && make -j4`)
+- Non-regression tests on each code change, for Linux64 and Windows32/64, CLI and GUI versions
+- Prebuilt binaries for Windows32, Windows64, Linux64 (static builds and AppImage builds), CLI and GUI versions
+- Fixed a bunch of (minor) quirks, a few (minor) bugs, added a couple (minor) features

-For more information please refer to the [CHANGELOG](CHANGELOG).
+Please refer to the [CHANGELOG](CHANGELOG) for all the details.

-This version will never break compatibility with upstream versions, the goal is to ensure an optical media protected by upstream dvdisaster will still be able to be repaired with this version 10+ years from now. Regression tests are here to ensure this is the case.
+:loudspeaker: This version will never break compatibility with upstream versions, the goal is to ensure an optical media protected by upstream dvdisaster will still be able to be repaired with this version 10+ years from now. Regression tests are here to ensure this is the case.

-## 3 available protection modes ("codecs")
+## :twisted_rightwards_arrows: Choose between 3 protection modes ("codecs")

-**RS01** creates error correction files which are stored separately from the image they belong to.
+:one: **RS01** creates error correction files which are stored separately from the image they belong to.
 The artefact is an **ecc** file, which must be stored on another media than the one we're protecting.

-**RS02** creates error correction data which is added to the medium to protect, we call this *augmenting* the image we're protecting. Damaged sectors in the error correction information reduce the data recovering capacity, but do not make recovery impossible - a second medium for keeping or protecting the error correction
+:two: **RS02** creates error correction data which is added to the medium to protect, we call this *augmenting* the image we're protecting. Damaged sectors in the error correction information reduce the data recovering capacity, but do not make recovery impossible - a second medium for keeping or protecting the error correction
 information is not required.

-**RS03** is a further development of RS01 and RS02. It can create both error correction files and
+:three: **RS03** is a further development of RS01 and RS02. It can create both error correction files and
 augmented images, with the following added features:

- RS03 can use multiple CPU cores and is therefore much faster than RS01/RS02 on modern hardware.
+- RS03 can use multiple CPU cores and is therefore **much** faster than RS01/RS02 on modern hardware.
 - RS03 error correction files are - contrary to RS01, and to a lesser extent RS02 - robust against damage.
 - RS03 is more robust, but also more restrictive: The augmented image must completely fill the medium now while the size of augmented images can be freely chosen in RS02.
  The changes for parallel computation and higher robustness make RS03 a bit less space efficient,
-  e.g. RS03 error correction data has slighly less error correction capacity than its RS01/RS02 counterparts on images with equal size.
+  e.g. RS03 error correction data has slighly less (around -3%) error correction capacity than its RS01/RS02 counterparts on images with equal size.

-# Rationale
+Rough comparison table:
+
+| Codecs           |              RS01              |              RS02              |              RS03              |
+|------------------|--------------------------------|--------------------------------|--------------------------------|
+| Robustness\*     | :star:                         | :star::star::star:             | :star::star::star::star::star: |
+| Speed            | :star::star:                   | :star:                         | :star::star::star::star::star: |
+| Space efficiency | :star::star::star::star::star: | :star::star::star::star::star: | :star::star::star::star:       |
+| Augmented images | :x:                            | :heavy_check_mark:             | :heavy_check_mark:             |
+| Separate files   | :heavy_check_mark:             | :x:                            | :heavy_check_mark:             |
+
+\*Robustness against corruption of the dvdisaster-added ECC parts themselves
+
+# :bulb: Rationale

 Even if the optical media era is sunsetting now, and has been for a few years, it's still of some value for off-site backups. In any case, we still have media in our hands that we want to be able to repair, should it be damaged, during the next years/decades. Repairing is actually pretty much the very reason of dvdisaster existence (as long as parity data has been added, of course).
 The idea of this unofficial version is to ensure dvdisaster doesn't get hard to find, use or compile, should upstream development never resume (we hope it does!).
 This is also why precompiled Windows binaries and a precompiled static CLI-only Linux version are available here.

-# Compiling
+# :hammer: Compiling

 See the [INSTALL](INSTALL) file. The [workflow file](.github/workflows/release.yml) that is used to automatically build binaries for each release can also help.

-# Screenshots
+# :camera: Screenshots

 ### Scanning a damaged CD under Windows

--- a/6
+++ b/6
@@ -8,7 +8,7 @@ Version 0.79: new RS03 codec (encoding part)
 0.79.5: project re-launch
 0.79.6: re-introduce CRC and MD5 caching between reading
         and ecc creation; cosmetical changes
- 0.79.7: re-introduce adaptive reading
+ 0.79.7: re-introduce adaptive reading [partly done in pl4]

 Version 0.80: milestone release
 - RS03 encoding considered feature complete
@@ -23,7 +23,7 @@ Version 0.82: milestone release
 - RS03 decoding considered feature complete

 Version 0.84:
- - compile option to create a CLI-only binary
+ - compile option to create a CLI-only binary [done in pl1]
   (without GTK+ linkage)

 Version 0.86:
@@ -53,7 +53,7 @@ Unspecified schedule / later releases
 - add pause/resume button
 - optionally pause after n read errors for drives which
   need to cool down 
- - add function for stripping RS02 data from image
+ - add function for stripping RS02 data from image [done in pl7]
 - add quiet option for command line mode
 - display estimated finishing time for encoding/decoding
 - catch up with many other queued up suggestions
--- a/53
+++ b/53
@@ -4,14 +4,10 @@

 BASH_BASED_CONFIGURE=./scripts/bash-based-configure
 BASH_BASED_CONFIGURE_OPTS="--buildtmp=$(pwd)/build $@"
-REQUIRED_CFLAGS="-DPATCHLEVEL=5 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -I. -pipe"
-RECOMMENDED_CFLAGS="-O2 -fomit-frame-pointer -Wall -Wno-deprecated-declarations -Wno-stringop-truncation"
+REQUIRED_CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -I. -pipe"
+RECOMMENDED_CFLAGS="-O2 -fomit-frame-pointer -Wall -Wno-unknown-warning-option -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-format-zero-length"
 DEBUG_CFLAGS="-ggdb -Wall"

-if [ "$CLI_ONLY" = 1 ]; then
-  REQUIRED_CFLAGS="-DCLI $REQUIRED_CFLAGS"
-fi
-
 CFG_USE_CYGWIN="no"   # do not change

 if test -e $BASH_BASED_CONFIGURE; then
@@ -25,8 +21,8 @@ fi
 # Set the package name and version

 PACKAGE dvdisaster 0.79.6
-CFG_HAVE_OPTIONS="$CFG_HAVE_OPTIONS -DHAVE_UNSTABLE_RELEASE"
-
+DEFINE_INT PATCHLEVEL 9
+DEFINE_STRING HAVE_UNSTABLE_RELEASE 1

 # Check for some essential tools.

@@ -48,12 +44,27 @@ GET_LOCALEDIR
 GET_BUILDROOT
 GET_BUILDTMP

+PRINT_MESSAGE "\nDetermining build flavor:"
+
+# old way of specifying --with-cli-only
+if [ "$CLI_ONLY" = 1 ]; then
+  cfg_with_cli_only=yes
+  unset CLI_ONLY
+fi
+
+WITH_OPTION cli-only no "[yes | no]"
+
+# Remove the useless CLI console under windows
+if [[ $(uname) =~ MINGW ]] && [ "$cfg_with_cli_only" != "yes" ]; then
+  CFG_LDFLAGS="$CFG_LDFLAGS -mwindows"
+fi
+
 # Look for required libraries

 PRINT_MESSAGE "\nLooking for includes and libraries:"

 REQUIRE_GLIB2 2 32 0
-if [ "$CLI_ONLY" != 1 ]; then
+if test "$cfg_with_cli_only" != "yes"; then
  REQUIRE_GTK2 2 6 0 WITH_THREADS
 fi
 echo
@@ -117,7 +128,7 @@ if ! EXECUTE_PROGRAM "xgettext --help" xgettext \
  cfg_force_with_nls=no
 fi

-if [ "$CLI_ONLY" != 1 ]; then
+if test "$cfg_with_cli_only" != "yes"; then
  if ! EXECUTE_PROGRAM "gdk-pixbuf-csource --help" gdk_pixbuf_csource ; then
    echo "* gdk-pixbuf not installed"
    echo "* or path to gdk-pixbuf-csource is missing."
@@ -135,6 +146,24 @@ WITH_OPTION embedded-src-path yes "[yes | no]"
 PRINT_MESSAGE "\nDebugging options (do not use in production system):"

 WITH_OPTION memdebug no "[no | yes]"
+WITH_OPTION debug-printf-format no "[no | yes]"
+WITH_OPTION werror no "[no | yes]"
+
+if test "$cfg_with_debug_printf_format" == "yes"; then
+  # don't use the binary compiled with this,
+  # it's only useful to properly get all the build-time
+  # warnings around printf-errors, that are otherwise
+  # not catched by the compiler because of the _() macro
+  DEFINE_STRING DEBUG_PRINTF_FORMAT 1
+else
+  # warnings given by -Wformat-security are bogus because of _(),
+  # see above comment if you actually want to check for format errors
+  CFG_CFLAGS="$CFG_CFLAGS -Wno-format-security"
+fi
+
+if test "$cfg_with_werror" == "yes"; then
+  CFG_CFLAGS="$CFG_CFLAGS -Werror"
+fi

 if test "$cfg_with_efence" == "yes"; then
  if ! CHECK_LIBRARY efence malloc efence; then
@@ -160,7 +189,7 @@ cfiles="src/method-link.c"
 ofiles="$BUILDTMP/method-link.o"

 for cfile in src/*.c; do
-  if [ "$CLI_ONLY" = 1 ]; then
+  if test "$cfg_with_cli_only" == "yes"; then
    grep -q 'DVDISASTER_GUI_FILE' "$cfile" && continue
  fi
  cfile_prefix=`echo $cfile | sed -e 's/\.c//'`
@@ -172,7 +201,7 @@ done
 echo
 echo -e "\nCFG_CFILES = $cfiles" >> Makefile.config
 echo "CFG_OFILES = $ofiles" >> Makefile.config
-if [ "$CLI_ONLY" != 1 ]; then
+if test "$cfg_with_cli_only" != "yes"; then
  echo "ICONS = src/inlined-icons.h" >> Makefile.config
 fi

--- a/documentation/codec-specs/Makefile
+++ b/documentation/codec-specs/Makefile
@@ -1,6 +1,6 @@
-.PHONY : all codecs clean
+.PHONY : all clean

-all: codecs
+all: codecs.pdf

 clean:
 	@rm -f *~ *.aux *.log *.bak *.out *.toc *.dvi *.ps
@@ -8,7 +8,9 @@ clean:
 archclean: clean
 	@rm -f *.pdf

-codecs:
+# run latex twice to get the proper number of pages, fig numbers and index table
+codecs.pdf: *.tex *.fig *.eps
+	latex codecs
 	latex codecs
 	dvips codecs.dvi
 	ps2pdf codecs.ps
--- a/documentation/codec-specs/codecs.pdf
+++ b/documentation/codec-specs/codecs.pdf
--- a/icons/nothing.png
+++ b/icons/nothing.png
--- a/icons/strip.png
+++ b/icons/strip.png
--- a/icons/tooltip.png
+++ b/icons/tooltip.png
--- a/locale/cs.po
+++ b/locale/cs.po
--- a/locale/de.po
+++ b/locale/de.po
--- a/locale/it.po
+++ b/locale/it.po
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
--- a/locale/ru.po
+++ b/locale/ru.po
--- a/locale/sv.po
+++ b/locale/sv.po
--- a/regtest/common.bash
+++ b/regtest/common.bash
@@ -30,16 +30,11 @@ fi

 nbfailed=0

-# Assemble sed expressions for removal of variable output contents
-
-SED_REMOVE_ISO_DIR="([a-zA-Z]:/[a-zA-Z0-9/]+)?${ISODIR}/"
-
 # For MSYS2

 if [ -n "$ORIGINAL_TEMP" ]; then
    ISODIR="$ORIGINAL_TEMP"
    # /c/ => C:/
-    SED_REMOVE_ISO_DIR="$(echo "$ISODIR" | cut -c2 | tr a-z A-Z):$(echo "$ISODIR" | cut -c3-)/"
    NON_EXISTENT_DEVICE=V:
 fi

@@ -196,7 +191,7 @@ function run_regtest()
   local testeccopt=""
   local image_md5=""
   local ecc_md5=""
-   local pass="true"
+   local pass="false"

   local fail_on_bad=$(grep "FAIL_ON_BAD" $CONFIGFILE)
   fail_on_bad=$(echo $fail_on_bad | cut -d\  -f 2) 
@@ -214,66 +209,69 @@ function run_regtest()
   REFLOG=${DATABASE}/${CODEC_PREFIX}_${testsymbol}

   if test "$gui_mode" == "false"; then
-     rm -f $NEWLOG
+      rm -f $NEWLOG

-     echo "LANG=en_EN.UTF-8 $NEWVER --regtest --no-progress -i${testiso} ${testeccopt} ${extra_args} ${testparms}" >>$LOGFILE 
-     LANG=en_EN.UTF-8 $NEWVER --regtest --no-progress -i${testiso} ${testeccopt} ${extra_args} ${testparms} 2>&1 | tail -n +3  >>$NEWLOG 
+      echo "LANG=en_EN.UTF-8 $NEWVER --regtest --no-progress -i${testiso} ${testeccopt} ${extra_args} ${testparms}" >>$LOGFILE 
+      LANG=en_EN.UTF-8 $NEWVER --regtest --no-progress -i${testiso} ${testeccopt} ${extra_args} ${testparms} 2>&1 | tail -n +3  >>$NEWLOG 

-     if ! test -r $REFLOG; then
-	 echo -e "FAIL\n$REFLOG missing in log file database"
-	 return
-     fi
+      if ! test -r $REFLOG; then
+          pass="false"
+          if [ "$REGTEST_NO_UTF8" = 1 ]; then
+             echo "BAD; '$REFLOG' is missing in log file database"
+          else
+             printf "%b\r%b\n" "BAD; '$REFLOG' is missing in log file database" "[\e[31m✘\e[0m]"
+          fi
+      else
+         # ignore the memory tracker line when no memory leaks
+         # have been found

-     # ignore the memory tracker line when no memory leaks
-     # have been found
-     
-     grep -va "dvdisaster: No memory leaks found." $NEWLOG >$TMPLOG
-     mv $TMPLOG $NEWLOG
-     
-     # ignore log lines specified by user
-     
-     if test -n "$IGNORE_LOG_LINE"; then
-	 grep -Eva "$IGNORE_LOG_LINE" $NEWLOG >$TMPLOG
-	 mv $TMPLOG $NEWLOG
-     fi
+         grep -va "dvdisaster: No memory leaks found." $NEWLOG >$TMPLOG
+         mv $TMPLOG $NEWLOG

-     filter=cat
-     echo "$options" | grep -qw SORTED && filter=sort
-     if [ "${CODEC_PREFIX}_${testsymbol}" = RS01_scan_no_device ] || \
-        [ "${CODEC_PREFIX}_${testsymbol}" = RS01_read_no_device ] || \
-        [ "${CODEC_PREFIX}_${testsymbol}" = RS01_adaptive_no_device ]; then
-	     # for Windows
-	     sed -i -re "s=device $NON_EXISTENT_DEVICE\.=/dev/sdz: No such file or directory=" $NEWLOG
-     fi
-       
-     if ! diff <(tail -n +3 $REFLOG | $filter) <(sed -re "s=${SED_REMOVE_ISO_DIR}==g" $NEWLOG | $filter) >${DIFFLOG}; then
-	 if [ "$REGTEST_NO_UTF8" = 1 ]; then
-	   echo "BAD; diffs found (<expected; >created):"
-	 else
-	   printf "%b\r%b\n" "BAD; diffs found (<expected; >created):" "[\e[31m✘\e[0m]"
-	 fi
-	 cat ${DIFFLOG}
+         # ignore log lines specified by user

-	 if test "$interactive_diff" == "yes"; then
-	   while true; do
-	      read -n 1 -p ">> Press 'a' to accept this diff; 'v' to vimdiff; any other key to fail this test:" -e answer
-	      if test "$answer" == "a"; then
-	         cp $REFLOG $LOGDIR
-	         head -n 2 $LOGDIR/${CODEC_PREFIX}_${testsymbol} >$REFLOG 
-	         sed -e "s=${SED_REMOVE_ISO_DIR}==g" $NEWLOG >>$REFLOG
-	         pass="skip"
-	      elif test "$answer" == "v"; then
-	         vimdiff $REFLOG $NEWLOG
-	         continue
-	      else
-	         pass="false"
-	      fi
-	      break
-	   done
-	 else
-	   pass="false"
-	 fi
-     fi
+         if test -n "$IGNORE_LOG_LINE"; then
+            grep -Eva "$IGNORE_LOG_LINE" $NEWLOG >$TMPLOG
+            mv $TMPLOG $NEWLOG
+         fi
+
+         filter=cat
+         echo "$options" | grep -qw SORTED && filter=sort
+         if [ "${CODEC_PREFIX}_${testsymbol}" = RS01_scan_no_device ] || \
+            [ "${CODEC_PREFIX}_${testsymbol}" = RS01_read_no_device ] || \
+            [ "${CODEC_PREFIX}_${testsymbol}" = RS01_adaptive_no_device ]; then
+            # for Windows
+            sed -i -re "s=device $NON_EXISTENT_DEVICE\.=/dev/sdz: No such file or directory=" $NEWLOG
+         fi
+
+         if ! diff <(tail -n +3 $REFLOG | $filter) <(sed -re "s=[a-zA-Z:/]+/([a-z0-9_-]+\.(ecc|iso))=\1=g;s=$ISODIR/==g" $NEWLOG | $filter) >${DIFFLOG}; then
+            if [ "$REGTEST_NO_UTF8" = 1 ]; then
+               echo "BAD; diffs found (<expected; >created):"
+            else
+               printf "%b\r%b\n" "BAD; diffs found (<expected; >created):" "[\e[31m✘\e[0m]"
+            fi
+            cat ${DIFFLOG}
+
+            if test "$interactive_diff" == "yes"; then
+               while true; do
+                  read -n 1 -p ">> Press 'a' to accept this diff; 'v' to vimdiff; any other key to fail this test:" -e answer
+                  if test "$answer" == "a"; then
+                     cp $REFLOG $LOGDIR
+                     head -n 2 $LOGDIR/${CODEC_PREFIX}_${testsymbol} >$REFLOG 
+                     sed -re "s=[a-zA-Z:/]+/([a-z0-9_-]+\.(ecc|iso))=\1=g;s=$ISODIR/==g" $NEWLOG >>$REFLOG
+                     pass="skip"
+                  elif test "$answer" == "v"; then
+                     vimdiff $REFLOG $NEWLOG
+
+                     continue
+                  fi
+                  break
+               done
+            fi
+         else
+            pass="true"
+         fi
+      fi
   else  # gui mode
       replace_config last-image "$testiso"
       if test -n "${testecc}"; then
@@ -292,10 +290,15 @@ function run_regtest()

   unset extra_args
     
-   image_md5=$(head -n 1 $REFLOG)
-   ecc_md5=$(head -n 2 $REFLOG | tail -n 1)
+   if test -r "$REFLOG"; then
+      image_md5=$(head -n 1 $REFLOG)
+      ecc_md5=$(head -n 2 $REFLOG | tail -n 1)
+   else
+      image_md5=ignore
+      ecc_md5=ignore
+   fi

-   if test ${image_md5} != "ignore"; then
+   if test "${image_md5}" != "ignore"; then
       md5=$($MD5SUM ${testiso} | cut -d\  -f 1)
       if test "$image_md5" != "$md5"; then
 	   if [ "$REGTEST_NO_UTF8" = 1 ]; then
@@ -309,7 +312,7 @@ function run_regtest()
       fi
   fi	   

-   if test ${ecc_md5} != "ignore"; then
+   if test "${ecc_md5}" != "ignore"; then
       md5=$($MD5SUM ${testecc} | cut -d\  -f 1)
       if test "$ecc_md5" != "$md5"; then
 	   if [ "$pass" = false ] || [ "$REGTEST_NO_UTF8" = 1 ]; then
@@ -340,7 +343,7 @@ function run_regtest()
      [ $nbfailed -ge 256 ] && nbfailed=255
      echo "test symbol for config: $testsymbol"
      if test "$fail_on_bad" == "yes"; then
-	next=$(grep -A 1  ${CODEC_PREFIX}_$testsymbol config.txt | tail -n 1 | cut -d\  -f 1)
+	next=$(grep -A 1 "${CODEC_PREFIX}_$testsymbol" config.txt | tail -n 1 | cut -d\  -f 1)
 	echo "FAIL_ON_BAD set to yes -- exiting"
 	if test "$gui_mode" == "true"; then
 	    guiarg="gui"
--- a/regtest/config.txt
+++ b/regtest/config.txt
@@ -170,6 +170,11 @@ RS01_adaptive_medium_with_dsm yes

 ### RS02 tests

+# Strip tests
+
+RS02_strip_ecc yes
+RS02_strip_ecc_not yes
+
 # Verify tests
 RS02_good yes
 RS02_good_quick yes
@@ -335,6 +340,11 @@ RS02_adaptive_with_wrong_rs03_file yes

 ### RS03 augmented image tests

+# Strip tests
+
+RS03i_strip_ecc yes
+RS03i_strip_ecc_not yes
+
 # Verify tests

 RS03i_good yes
--- a/regtest/database/RS01_adaptive_defective_large_skip
+++ b/regtest/database/RS01_adaptive_defective_large_skip
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS01_adaptive_defective_no_ecc
+++ b/regtest/database/RS01_adaptive_defective_no_ecc
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS01_adaptive_truncated_no_ecc_again
+++ b/regtest/database/RS01_adaptive_truncated_no_ecc_again
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: read error, trying next header
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS01_ecc_create_after_partial_read
+++ b/regtest/database/RS01_ecc_create_after_partial_read
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -153,6 +221,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS01_ecc_create_after_read
+++ b/regtest/database/RS01_ecc_create_after_read
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -154,6 +222,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS01_ecc_recreate_after_read_rs01
+++ b/regtest/database/RS01_ecc_recreate_after_read_rs01
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -156,6 +224,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS01_ecc_recreate_after_read_rs03f
+++ b/regtest/database/RS01_ecc_recreate_after_read_rs03f
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -170,6 +238,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS01_ecc_recreate_after_read_rs03i
+++ b/regtest/database/RS01_ecc_recreate_after_read_rs03i
@@ -84,7 +84,67 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+try_sector: trying sector 24576
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 4096
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 2048
+try_sector: trying sector 26624
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
@@ -166,6 +226,7 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS01_read_medium_with_dsm_in_image2_verbose
+++ b/regtest/database/RS01_read_medium_with_dsm_in_image2_verbose
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS01_read_medium_with_dsm_in_image_verbose
+++ b/regtest/database/RS01_read_medium_with_dsm_in_image_verbose
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS01_read_medium_with_dsm_verbose
+++ b/regtest/database/RS01_read_medium_with_dsm_verbose
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS01_uncorrectable_dsm_in_image2_verbose
+++ b/regtest/database/RS01_uncorrectable_dsm_in_image2_verbose
@@ -50,6 +50,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS01_uncorrectable_dsm_in_image_verbose
+++ b/regtest/database/RS01_uncorrectable_dsm_in_image_verbose
@@ -50,6 +50,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS02_bad_master
+++ b/regtest/database/RS02_bad_master
@@ -50,6 +50,7 @@ try_sector: trying sector 30000
 try_sector: read error, trying next header
 try_sector: trying sector 29850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS02_read_bad_master
+++ b/regtest/database/RS02_read_bad_master
@@ -84,11 +84,74 @@ try_sector: trying sector 30000
 try_sector: read error, trying next header
 try_sector: trying sector 29850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+try_sector: trying sector 32768
+try_sector: read error, trying next header
+FindHeaderInMedium: Trying modulo 16384
+Sector 32768 cached; skipping
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 32768 cached; skipping
+try_sector: trying sector 24576
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS02_read_bad_master_exhaustive
+++ b/regtest/database/RS02_read_bad_master_exhaustive
@@ -84,6 +84,7 @@ try_sector: trying sector 30000
 try_sector: read error, trying next header
 try_sector: trying sector 29850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 Medium rewriteable: FALSE
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
@@ -166,6 +167,334 @@ Reading CRC information from ecc data (RS02) ... RS02LayoutFromImage(): returnin
 done.
 Sector 30000, try 1: Medium Error; Unrecovered read error.
 Sector 30000: Medium Error; Unrecovered read error. Skipping 15 sectors.
+Current sector: 30001. This session: NewSectorsReadOK=30000, ReadErrors=1
+Current sector: 30002. This session: NewSectorsReadOK=30000, ReadErrors=2
+Current sector: 30003. This session: NewSectorsReadOK=30000, ReadErrors=3
+Current sector: 30004. This session: NewSectorsReadOK=30000, ReadErrors=4
+Current sector: 30005. This session: NewSectorsReadOK=30000, ReadErrors=5
+Current sector: 30006. This session: NewSectorsReadOK=30000, ReadErrors=6
+Current sector: 30007. This session: NewSectorsReadOK=30000, ReadErrors=7
+Current sector: 30008. This session: NewSectorsReadOK=30000, ReadErrors=8
+Current sector: 30009. This session: NewSectorsReadOK=30000, ReadErrors=9
+Current sector: 30010. This session: NewSectorsReadOK=30000, ReadErrors=10
+Current sector: 30011. This session: NewSectorsReadOK=30000, ReadErrors=11
+Current sector: 30012. This session: NewSectorsReadOK=30000, ReadErrors=12
+Current sector: 30013. This session: NewSectorsReadOK=30000, ReadErrors=13
+Current sector: 30014. This session: NewSectorsReadOK=30000, ReadErrors=14
+Current sector: 30015. This session: NewSectorsReadOK=30000, ReadErrors=15
+Current sector: 30016. This session: NewSectorsReadOK=30000, ReadErrors=16
+Current sector: 30016. This session: NewSectorsReadOK=30000, ReadErrors=16
+Current sector: 30032. This session: NewSectorsReadOK=30016, ReadErrors=16
+Current sector: 30048. This session: NewSectorsReadOK=30032, ReadErrors=16
+Current sector: 30064. This session: NewSectorsReadOK=30048, ReadErrors=16
+Current sector: 30080. This session: NewSectorsReadOK=30064, ReadErrors=16
+Current sector: 30096. This session: NewSectorsReadOK=30080, ReadErrors=16
+Current sector: 30112. This session: NewSectorsReadOK=30096, ReadErrors=16
+Current sector: 30128. This session: NewSectorsReadOK=30112, ReadErrors=16
+Current sector: 30144. This session: NewSectorsReadOK=30128, ReadErrors=16
+Current sector: 30160. This session: NewSectorsReadOK=30144, ReadErrors=16
+Current sector: 30176. This session: NewSectorsReadOK=30160, ReadErrors=16
+Current sector: 30192. This session: NewSectorsReadOK=30176, ReadErrors=16
+Current sector: 30208. This session: NewSectorsReadOK=30192, ReadErrors=16
+Current sector: 30224. This session: NewSectorsReadOK=30208, ReadErrors=16
+Current sector: 30240. This session: NewSectorsReadOK=30224, ReadErrors=16
+Current sector: 30256. This session: NewSectorsReadOK=30240, ReadErrors=16
+Current sector: 30272. This session: NewSectorsReadOK=30256, ReadErrors=16
+Current sector: 30288. This session: NewSectorsReadOK=30272, ReadErrors=16
+Current sector: 30304. This session: NewSectorsReadOK=30288, ReadErrors=16
+Current sector: 30320. This session: NewSectorsReadOK=30304, ReadErrors=16
+Current sector: 30336. This session: NewSectorsReadOK=30320, ReadErrors=16
+Current sector: 30352. This session: NewSectorsReadOK=30336, ReadErrors=16
+Current sector: 30368. This session: NewSectorsReadOK=30352, ReadErrors=16
+Current sector: 30384. This session: NewSectorsReadOK=30368, ReadErrors=16
+Current sector: 30400. This session: NewSectorsReadOK=30384, ReadErrors=16
+Current sector: 30416. This session: NewSectorsReadOK=30400, ReadErrors=16
+Current sector: 30432. This session: NewSectorsReadOK=30416, ReadErrors=16
+Current sector: 30448. This session: NewSectorsReadOK=30432, ReadErrors=16
+Current sector: 30464. This session: NewSectorsReadOK=30448, ReadErrors=16
+Current sector: 30480. This session: NewSectorsReadOK=30464, ReadErrors=16
+Current sector: 30496. This session: NewSectorsReadOK=30480, ReadErrors=16
+Current sector: 30512. This session: NewSectorsReadOK=30496, ReadErrors=16
+Current sector: 30528. This session: NewSectorsReadOK=30512, ReadErrors=16
+Current sector: 30544. This session: NewSectorsReadOK=30528, ReadErrors=16
+Current sector: 30560. This session: NewSectorsReadOK=30544, ReadErrors=16
+Current sector: 30576. This session: NewSectorsReadOK=30560, ReadErrors=16
+Current sector: 30592. This session: NewSectorsReadOK=30576, ReadErrors=16
+Current sector: 30608. This session: NewSectorsReadOK=30592, ReadErrors=16
+Current sector: 30624. This session: NewSectorsReadOK=30608, ReadErrors=16
+Current sector: 30640. This session: NewSectorsReadOK=30624, ReadErrors=16
+Current sector: 30656. This session: NewSectorsReadOK=30640, ReadErrors=16
+Current sector: 30672. This session: NewSectorsReadOK=30656, ReadErrors=16
+Current sector: 30688. This session: NewSectorsReadOK=30672, ReadErrors=16
+Current sector: 30704. This session: NewSectorsReadOK=30688, ReadErrors=16
+Current sector: 30720. This session: NewSectorsReadOK=30704, ReadErrors=16
+Current sector: 30736. This session: NewSectorsReadOK=30720, ReadErrors=16
+Current sector: 30752. This session: NewSectorsReadOK=30736, ReadErrors=16
+Current sector: 30768. This session: NewSectorsReadOK=30752, ReadErrors=16
+Current sector: 30784. This session: NewSectorsReadOK=30768, ReadErrors=16
+Current sector: 30800. This session: NewSectorsReadOK=30784, ReadErrors=16
+Current sector: 30816. This session: NewSectorsReadOK=30800, ReadErrors=16
+Current sector: 30832. This session: NewSectorsReadOK=30816, ReadErrors=16
+Current sector: 30848. This session: NewSectorsReadOK=30832, ReadErrors=16
+Current sector: 30864. This session: NewSectorsReadOK=30848, ReadErrors=16
+Current sector: 30880. This session: NewSectorsReadOK=30864, ReadErrors=16
+Current sector: 30896. This session: NewSectorsReadOK=30880, ReadErrors=16
+Current sector: 30912. This session: NewSectorsReadOK=30896, ReadErrors=16
+Current sector: 30928. This session: NewSectorsReadOK=30912, ReadErrors=16
+Current sector: 30944. This session: NewSectorsReadOK=30928, ReadErrors=16
+Current sector: 30960. This session: NewSectorsReadOK=30944, ReadErrors=16
+Current sector: 30976. This session: NewSectorsReadOK=30960, ReadErrors=16
+Current sector: 30992. This session: NewSectorsReadOK=30976, ReadErrors=16
+Current sector: 31008. This session: NewSectorsReadOK=30992, ReadErrors=16
+Current sector: 31024. This session: NewSectorsReadOK=31008, ReadErrors=16
+Current sector: 31040. This session: NewSectorsReadOK=31024, ReadErrors=16
+Current sector: 31056. This session: NewSectorsReadOK=31040, ReadErrors=16
+Current sector: 31072. This session: NewSectorsReadOK=31056, ReadErrors=16
+Current sector: 31088. This session: NewSectorsReadOK=31072, ReadErrors=16
+Current sector: 31104. This session: NewSectorsReadOK=31088, ReadErrors=16
+Current sector: 31120. This session: NewSectorsReadOK=31104, ReadErrors=16
+Current sector: 31136. This session: NewSectorsReadOK=31120, ReadErrors=16
+Current sector: 31152. This session: NewSectorsReadOK=31136, ReadErrors=16
+Current sector: 31168. This session: NewSectorsReadOK=31152, ReadErrors=16
+Current sector: 31184. This session: NewSectorsReadOK=31168, ReadErrors=16
+Current sector: 31200. This session: NewSectorsReadOK=31184, ReadErrors=16
+Current sector: 31216. This session: NewSectorsReadOK=31200, ReadErrors=16
+Current sector: 31232. This session: NewSectorsReadOK=31216, ReadErrors=16
+Current sector: 31248. This session: NewSectorsReadOK=31232, ReadErrors=16
+Current sector: 31264. This session: NewSectorsReadOK=31248, ReadErrors=16
+Current sector: 31280. This session: NewSectorsReadOK=31264, ReadErrors=16
+Current sector: 31296. This session: NewSectorsReadOK=31280, ReadErrors=16
+Current sector: 31312. This session: NewSectorsReadOK=31296, ReadErrors=16
+Current sector: 31328. This session: NewSectorsReadOK=31312, ReadErrors=16
+Current sector: 31344. This session: NewSectorsReadOK=31328, ReadErrors=16
+Current sector: 31360. This session: NewSectorsReadOK=31344, ReadErrors=16
+Current sector: 31376. This session: NewSectorsReadOK=31360, ReadErrors=16
+Current sector: 31392. This session: NewSectorsReadOK=31376, ReadErrors=16
+Current sector: 31408. This session: NewSectorsReadOK=31392, ReadErrors=16
+Current sector: 31424. This session: NewSectorsReadOK=31408, ReadErrors=16
+Current sector: 31440. This session: NewSectorsReadOK=31424, ReadErrors=16
+Current sector: 31456. This session: NewSectorsReadOK=31440, ReadErrors=16
+Current sector: 31472. This session: NewSectorsReadOK=31456, ReadErrors=16
+Current sector: 31488. This session: NewSectorsReadOK=31472, ReadErrors=16
+Current sector: 31504. This session: NewSectorsReadOK=31488, ReadErrors=16
+Current sector: 31520. This session: NewSectorsReadOK=31504, ReadErrors=16
+Current sector: 31536. This session: NewSectorsReadOK=31520, ReadErrors=16
+Current sector: 31552. This session: NewSectorsReadOK=31536, ReadErrors=16
+Current sector: 31568. This session: NewSectorsReadOK=31552, ReadErrors=16
+Current sector: 31584. This session: NewSectorsReadOK=31568, ReadErrors=16
+Current sector: 31600. This session: NewSectorsReadOK=31584, ReadErrors=16
+Current sector: 31616. This session: NewSectorsReadOK=31600, ReadErrors=16
+Current sector: 31632. This session: NewSectorsReadOK=31616, ReadErrors=16
+Current sector: 31648. This session: NewSectorsReadOK=31632, ReadErrors=16
+Current sector: 31664. This session: NewSectorsReadOK=31648, ReadErrors=16
+Current sector: 31680. This session: NewSectorsReadOK=31664, ReadErrors=16
+Current sector: 31696. This session: NewSectorsReadOK=31680, ReadErrors=16
+Current sector: 31712. This session: NewSectorsReadOK=31696, ReadErrors=16
+Current sector: 31728. This session: NewSectorsReadOK=31712, ReadErrors=16
+Current sector: 31744. This session: NewSectorsReadOK=31728, ReadErrors=16
+Current sector: 31760. This session: NewSectorsReadOK=31744, ReadErrors=16
+Current sector: 31776. This session: NewSectorsReadOK=31760, ReadErrors=16
+Current sector: 31792. This session: NewSectorsReadOK=31776, ReadErrors=16
+Current sector: 31808. This session: NewSectorsReadOK=31792, ReadErrors=16
+Current sector: 31824. This session: NewSectorsReadOK=31808, ReadErrors=16
+Current sector: 31840. This session: NewSectorsReadOK=31824, ReadErrors=16
+Current sector: 31856. This session: NewSectorsReadOK=31840, ReadErrors=16
+Current sector: 31872. This session: NewSectorsReadOK=31856, ReadErrors=16
+Current sector: 31888. This session: NewSectorsReadOK=31872, ReadErrors=16
+Current sector: 31904. This session: NewSectorsReadOK=31888, ReadErrors=16
+Current sector: 31920. This session: NewSectorsReadOK=31904, ReadErrors=16
+Current sector: 31936. This session: NewSectorsReadOK=31920, ReadErrors=16
+Current sector: 31952. This session: NewSectorsReadOK=31936, ReadErrors=16
+Current sector: 31968. This session: NewSectorsReadOK=31952, ReadErrors=16
+Current sector: 31984. This session: NewSectorsReadOK=31968, ReadErrors=16
+Current sector: 32000. This session: NewSectorsReadOK=31984, ReadErrors=16
+Current sector: 32016. This session: NewSectorsReadOK=32000, ReadErrors=16
+Current sector: 32032. This session: NewSectorsReadOK=32016, ReadErrors=16
+Current sector: 32048. This session: NewSectorsReadOK=32032, ReadErrors=16
+Current sector: 32064. This session: NewSectorsReadOK=32048, ReadErrors=16
+Current sector: 32080. This session: NewSectorsReadOK=32064, ReadErrors=16
+Current sector: 32096. This session: NewSectorsReadOK=32080, ReadErrors=16
+Current sector: 32112. This session: NewSectorsReadOK=32096, ReadErrors=16
+Current sector: 32128. This session: NewSectorsReadOK=32112, ReadErrors=16
+Current sector: 32144. This session: NewSectorsReadOK=32128, ReadErrors=16
+Current sector: 32160. This session: NewSectorsReadOK=32144, ReadErrors=16
+Current sector: 32176. This session: NewSectorsReadOK=32160, ReadErrors=16
+Current sector: 32192. This session: NewSectorsReadOK=32176, ReadErrors=16
+Current sector: 32208. This session: NewSectorsReadOK=32192, ReadErrors=16
+Current sector: 32224. This session: NewSectorsReadOK=32208, ReadErrors=16
+Current sector: 32240. This session: NewSectorsReadOK=32224, ReadErrors=16
+Current sector: 32256. This session: NewSectorsReadOK=32240, ReadErrors=16
+Current sector: 32272. This session: NewSectorsReadOK=32256, ReadErrors=16
+Current sector: 32288. This session: NewSectorsReadOK=32272, ReadErrors=16
+Current sector: 32304. This session: NewSectorsReadOK=32288, ReadErrors=16
+Current sector: 32320. This session: NewSectorsReadOK=32304, ReadErrors=16
+Current sector: 32336. This session: NewSectorsReadOK=32320, ReadErrors=16
+Current sector: 32352. This session: NewSectorsReadOK=32336, ReadErrors=16
+Current sector: 32368. This session: NewSectorsReadOK=32352, ReadErrors=16
+Current sector: 32384. This session: NewSectorsReadOK=32368, ReadErrors=16
+Current sector: 32400. This session: NewSectorsReadOK=32384, ReadErrors=16
+Current sector: 32416. This session: NewSectorsReadOK=32400, ReadErrors=16
+Current sector: 32432. This session: NewSectorsReadOK=32416, ReadErrors=16
+Current sector: 32448. This session: NewSectorsReadOK=32432, ReadErrors=16
+Current sector: 32464. This session: NewSectorsReadOK=32448, ReadErrors=16
+Current sector: 32480. This session: NewSectorsReadOK=32464, ReadErrors=16
+Current sector: 32496. This session: NewSectorsReadOK=32480, ReadErrors=16
+Current sector: 32512. This session: NewSectorsReadOK=32496, ReadErrors=16
+Current sector: 32528. This session: NewSectorsReadOK=32512, ReadErrors=16
+Current sector: 32544. This session: NewSectorsReadOK=32528, ReadErrors=16
+Current sector: 32560. This session: NewSectorsReadOK=32544, ReadErrors=16
+Current sector: 32576. This session: NewSectorsReadOK=32560, ReadErrors=16
+Current sector: 32592. This session: NewSectorsReadOK=32576, ReadErrors=16
+Current sector: 32608. This session: NewSectorsReadOK=32592, ReadErrors=16
+Current sector: 32624. This session: NewSectorsReadOK=32608, ReadErrors=16
+Current sector: 32640. This session: NewSectorsReadOK=32624, ReadErrors=16
+Current sector: 32656. This session: NewSectorsReadOK=32640, ReadErrors=16
+Current sector: 32672. This session: NewSectorsReadOK=32656, ReadErrors=16
+Current sector: 32688. This session: NewSectorsReadOK=32672, ReadErrors=16
+Current sector: 32704. This session: NewSectorsReadOK=32688, ReadErrors=16
+Current sector: 32720. This session: NewSectorsReadOK=32704, ReadErrors=16
+Current sector: 32736. This session: NewSectorsReadOK=32720, ReadErrors=16
+Current sector: 32752. This session: NewSectorsReadOK=32736, ReadErrors=16
+Current sector: 32768. This session: NewSectorsReadOK=32752, ReadErrors=16
+Current sector: 32784. This session: NewSectorsReadOK=32768, ReadErrors=16
+Current sector: 32800. This session: NewSectorsReadOK=32784, ReadErrors=16
+Current sector: 32816. This session: NewSectorsReadOK=32800, ReadErrors=16
+Current sector: 32832. This session: NewSectorsReadOK=32816, ReadErrors=16
+Current sector: 32848. This session: NewSectorsReadOK=32832, ReadErrors=16
+Current sector: 32864. This session: NewSectorsReadOK=32848, ReadErrors=16
+Current sector: 32880. This session: NewSectorsReadOK=32864, ReadErrors=16
+Current sector: 32896. This session: NewSectorsReadOK=32880, ReadErrors=16
+Current sector: 32912. This session: NewSectorsReadOK=32896, ReadErrors=16
+Current sector: 32928. This session: NewSectorsReadOK=32912, ReadErrors=16
+Current sector: 32944. This session: NewSectorsReadOK=32928, ReadErrors=16
+Current sector: 32960. This session: NewSectorsReadOK=32944, ReadErrors=16
+Current sector: 32976. This session: NewSectorsReadOK=32960, ReadErrors=16
+Current sector: 32992. This session: NewSectorsReadOK=32976, ReadErrors=16
+Current sector: 33008. This session: NewSectorsReadOK=32992, ReadErrors=16
+Current sector: 33024. This session: NewSectorsReadOK=33008, ReadErrors=16
+Current sector: 33040. This session: NewSectorsReadOK=33024, ReadErrors=16
+Current sector: 33056. This session: NewSectorsReadOK=33040, ReadErrors=16
+Current sector: 33072. This session: NewSectorsReadOK=33056, ReadErrors=16
+Current sector: 33088. This session: NewSectorsReadOK=33072, ReadErrors=16
+Current sector: 33104. This session: NewSectorsReadOK=33088, ReadErrors=16
+Current sector: 33120. This session: NewSectorsReadOK=33104, ReadErrors=16
+Current sector: 33136. This session: NewSectorsReadOK=33120, ReadErrors=16
+Current sector: 33152. This session: NewSectorsReadOK=33136, ReadErrors=16
+Current sector: 33168. This session: NewSectorsReadOK=33152, ReadErrors=16
+Current sector: 33184. This session: NewSectorsReadOK=33168, ReadErrors=16
+Current sector: 33200. This session: NewSectorsReadOK=33184, ReadErrors=16
+Current sector: 33216. This session: NewSectorsReadOK=33200, ReadErrors=16
+Current sector: 33232. This session: NewSectorsReadOK=33216, ReadErrors=16
+Current sector: 33248. This session: NewSectorsReadOK=33232, ReadErrors=16
+Current sector: 33264. This session: NewSectorsReadOK=33248, ReadErrors=16
+Current sector: 33280. This session: NewSectorsReadOK=33264, ReadErrors=16
+Current sector: 33296. This session: NewSectorsReadOK=33280, ReadErrors=16
+Current sector: 33312. This session: NewSectorsReadOK=33296, ReadErrors=16
+Current sector: 33328. This session: NewSectorsReadOK=33312, ReadErrors=16
+Current sector: 33344. This session: NewSectorsReadOK=33328, ReadErrors=16
+Current sector: 33360. This session: NewSectorsReadOK=33344, ReadErrors=16
+Current sector: 33376. This session: NewSectorsReadOK=33360, ReadErrors=16
+Current sector: 33392. This session: NewSectorsReadOK=33376, ReadErrors=16
+Current sector: 33408. This session: NewSectorsReadOK=33392, ReadErrors=16
+Current sector: 33424. This session: NewSectorsReadOK=33408, ReadErrors=16
+Current sector: 33440. This session: NewSectorsReadOK=33424, ReadErrors=16
+Current sector: 33456. This session: NewSectorsReadOK=33440, ReadErrors=16
+Current sector: 33472. This session: NewSectorsReadOK=33456, ReadErrors=16
+Current sector: 33488. This session: NewSectorsReadOK=33472, ReadErrors=16
+Current sector: 33504. This session: NewSectorsReadOK=33488, ReadErrors=16
+Current sector: 33520. This session: NewSectorsReadOK=33504, ReadErrors=16
+Current sector: 33536. This session: NewSectorsReadOK=33520, ReadErrors=16
+Current sector: 33552. This session: NewSectorsReadOK=33536, ReadErrors=16
+Current sector: 33568. This session: NewSectorsReadOK=33552, ReadErrors=16
+Current sector: 33584. This session: NewSectorsReadOK=33568, ReadErrors=16
+Current sector: 33600. This session: NewSectorsReadOK=33584, ReadErrors=16
+Current sector: 33616. This session: NewSectorsReadOK=33600, ReadErrors=16
+Current sector: 33632. This session: NewSectorsReadOK=33616, ReadErrors=16
+Current sector: 33648. This session: NewSectorsReadOK=33632, ReadErrors=16
+Current sector: 33664. This session: NewSectorsReadOK=33648, ReadErrors=16
+Current sector: 33680. This session: NewSectorsReadOK=33664, ReadErrors=16
+Current sector: 33696. This session: NewSectorsReadOK=33680, ReadErrors=16
+Current sector: 33712. This session: NewSectorsReadOK=33696, ReadErrors=16
+Current sector: 33728. This session: NewSectorsReadOK=33712, ReadErrors=16
+Current sector: 33744. This session: NewSectorsReadOK=33728, ReadErrors=16
+Current sector: 33760. This session: NewSectorsReadOK=33744, ReadErrors=16
+Current sector: 33776. This session: NewSectorsReadOK=33760, ReadErrors=16
+Current sector: 33792. This session: NewSectorsReadOK=33776, ReadErrors=16
+Current sector: 33808. This session: NewSectorsReadOK=33792, ReadErrors=16
+Current sector: 33824. This session: NewSectorsReadOK=33808, ReadErrors=16
+Current sector: 33840. This session: NewSectorsReadOK=33824, ReadErrors=16
+Current sector: 33856. This session: NewSectorsReadOK=33840, ReadErrors=16
+Current sector: 33872. This session: NewSectorsReadOK=33856, ReadErrors=16
+Current sector: 33888. This session: NewSectorsReadOK=33872, ReadErrors=16
+Current sector: 33904. This session: NewSectorsReadOK=33888, ReadErrors=16
+Current sector: 33920. This session: NewSectorsReadOK=33904, ReadErrors=16
+Current sector: 33936. This session: NewSectorsReadOK=33920, ReadErrors=16
+Current sector: 33952. This session: NewSectorsReadOK=33936, ReadErrors=16
+Current sector: 33968. This session: NewSectorsReadOK=33952, ReadErrors=16
+Current sector: 33984. This session: NewSectorsReadOK=33968, ReadErrors=16
+Current sector: 34000. This session: NewSectorsReadOK=33984, ReadErrors=16
+Current sector: 34016. This session: NewSectorsReadOK=34000, ReadErrors=16
+Current sector: 34032. This session: NewSectorsReadOK=34016, ReadErrors=16
+Current sector: 34048. This session: NewSectorsReadOK=34032, ReadErrors=16
+Current sector: 34064. This session: NewSectorsReadOK=34048, ReadErrors=16
+Current sector: 34080. This session: NewSectorsReadOK=34064, ReadErrors=16
+Current sector: 34096. This session: NewSectorsReadOK=34080, ReadErrors=16
+Current sector: 34112. This session: NewSectorsReadOK=34096, ReadErrors=16
+Current sector: 34128. This session: NewSectorsReadOK=34112, ReadErrors=16
+Current sector: 34144. This session: NewSectorsReadOK=34128, ReadErrors=16
+Current sector: 34160. This session: NewSectorsReadOK=34144, ReadErrors=16
+Current sector: 34176. This session: NewSectorsReadOK=34160, ReadErrors=16
+Current sector: 34192. This session: NewSectorsReadOK=34176, ReadErrors=16
+Current sector: 34208. This session: NewSectorsReadOK=34192, ReadErrors=16
+Current sector: 34224. This session: NewSectorsReadOK=34208, ReadErrors=16
+Current sector: 34240. This session: NewSectorsReadOK=34224, ReadErrors=16
+Current sector: 34256. This session: NewSectorsReadOK=34240, ReadErrors=16
+Current sector: 34272. This session: NewSectorsReadOK=34256, ReadErrors=16
+Current sector: 34288. This session: NewSectorsReadOK=34272, ReadErrors=16
+Current sector: 34304. This session: NewSectorsReadOK=34288, ReadErrors=16
+Current sector: 34320. This session: NewSectorsReadOK=34304, ReadErrors=16
+Current sector: 34336. This session: NewSectorsReadOK=34320, ReadErrors=16
+Current sector: 34352. This session: NewSectorsReadOK=34336, ReadErrors=16
+Current sector: 34368. This session: NewSectorsReadOK=34352, ReadErrors=16
+Current sector: 34384. This session: NewSectorsReadOK=34368, ReadErrors=16
+Current sector: 34400. This session: NewSectorsReadOK=34384, ReadErrors=16
+Current sector: 34416. This session: NewSectorsReadOK=34400, ReadErrors=16
+Current sector: 34432. This session: NewSectorsReadOK=34416, ReadErrors=16
+Current sector: 34448. This session: NewSectorsReadOK=34432, ReadErrors=16
+Current sector: 34464. This session: NewSectorsReadOK=34448, ReadErrors=16
+Current sector: 34480. This session: NewSectorsReadOK=34464, ReadErrors=16
+Current sector: 34496. This session: NewSectorsReadOK=34480, ReadErrors=16
+Current sector: 34512. This session: NewSectorsReadOK=34496, ReadErrors=16
+Current sector: 34528. This session: NewSectorsReadOK=34512, ReadErrors=16
+Current sector: 34544. This session: NewSectorsReadOK=34528, ReadErrors=16
+Current sector: 34560. This session: NewSectorsReadOK=34544, ReadErrors=16
+Current sector: 34576. This session: NewSectorsReadOK=34560, ReadErrors=16
+Current sector: 34592. This session: NewSectorsReadOK=34576, ReadErrors=16
+Current sector: 34608. This session: NewSectorsReadOK=34592, ReadErrors=16
+Current sector: 34624. This session: NewSectorsReadOK=34608, ReadErrors=16
+Current sector: 34640. This session: NewSectorsReadOK=34624, ReadErrors=16
+Current sector: 34656. This session: NewSectorsReadOK=34640, ReadErrors=16
+Current sector: 34672. This session: NewSectorsReadOK=34656, ReadErrors=16
+Current sector: 34688. This session: NewSectorsReadOK=34672, ReadErrors=16
+Current sector: 34704. This session: NewSectorsReadOK=34688, ReadErrors=16
+Current sector: 34720. This session: NewSectorsReadOK=34704, ReadErrors=16
+Current sector: 34736. This session: NewSectorsReadOK=34720, ReadErrors=16
+Current sector: 34752. This session: NewSectorsReadOK=34736, ReadErrors=16
+Current sector: 34768. This session: NewSectorsReadOK=34752, ReadErrors=16
+Current sector: 34784. This session: NewSectorsReadOK=34768, ReadErrors=16
+Current sector: 34800. This session: NewSectorsReadOK=34784, ReadErrors=16
+Current sector: 34816. This session: NewSectorsReadOK=34800, ReadErrors=16
+Current sector: 34832. This session: NewSectorsReadOK=34816, ReadErrors=16
+Current sector: 34848. This session: NewSectorsReadOK=34832, ReadErrors=16
+Current sector: 34864. This session: NewSectorsReadOK=34848, ReadErrors=16
+Current sector: 34880. This session: NewSectorsReadOK=34864, ReadErrors=16
+Current sector: 34896. This session: NewSectorsReadOK=34880, ReadErrors=16
+Current sector: 34912. This session: NewSectorsReadOK=34896, ReadErrors=16
+Current sector: 34928. This session: NewSectorsReadOK=34912, ReadErrors=16
+Current sector: 34929. This session: NewSectorsReadOK=34913, ReadErrors=16
+Current sector: 34930. This session: NewSectorsReadOK=34914, ReadErrors=16
+Current sector: 34931. This session: NewSectorsReadOK=34915, ReadErrors=16
+Current sector: 34932. This session: NewSectorsReadOK=34916, ReadErrors=16

 16 unreadable sectors.
 CrcBuf contents, image path none (medium):
--- a/regtest/database/RS02_read_modulo_glitch3
+++ b/regtest/database/RS02_read_modulo_glitch3
@@ -116,34 +116,177 @@ Reading CRC information from ecc data (RS02) ... RS02LayoutFromImage(): returnin
 done.
 Sector 357520, try 1: Illegal Request; Logical block address out of range.
 Sector 357520: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357521. This session: NewSectorsReadOK=357520, ReadErrors=1
+Current sector: 357522. This session: NewSectorsReadOK=357520, ReadErrors=2
+Current sector: 357523. This session: NewSectorsReadOK=357520, ReadErrors=3
+Current sector: 357524. This session: NewSectorsReadOK=357520, ReadErrors=4
+Current sector: 357525. This session: NewSectorsReadOK=357520, ReadErrors=5
+Current sector: 357526. This session: NewSectorsReadOK=357520, ReadErrors=6
+Current sector: 357527. This session: NewSectorsReadOK=357520, ReadErrors=7
+Current sector: 357528. This session: NewSectorsReadOK=357520, ReadErrors=8
+Current sector: 357529. This session: NewSectorsReadOK=357520, ReadErrors=9
+Current sector: 357530. This session: NewSectorsReadOK=357520, ReadErrors=10
+Current sector: 357531. This session: NewSectorsReadOK=357520, ReadErrors=11
+Current sector: 357532. This session: NewSectorsReadOK=357520, ReadErrors=12
+Current sector: 357533. This session: NewSectorsReadOK=357520, ReadErrors=13
+Current sector: 357534. This session: NewSectorsReadOK=357520, ReadErrors=14
+Current sector: 357535. This session: NewSectorsReadOK=357520, ReadErrors=15
+Current sector: 357536. This session: NewSectorsReadOK=357520, ReadErrors=16
+Current sector: 357536. This session: NewSectorsReadOK=357520, ReadErrors=16
 Sector 357536, try 1: Illegal Request; Logical block address out of range.
 Sector 357536: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357537. This session: NewSectorsReadOK=357520, ReadErrors=17
+Current sector: 357538. This session: NewSectorsReadOK=357520, ReadErrors=18
+Current sector: 357539. This session: NewSectorsReadOK=357520, ReadErrors=19
+Current sector: 357540. This session: NewSectorsReadOK=357520, ReadErrors=20
+Current sector: 357541. This session: NewSectorsReadOK=357520, ReadErrors=21
+Current sector: 357542. This session: NewSectorsReadOK=357520, ReadErrors=22
+Current sector: 357543. This session: NewSectorsReadOK=357520, ReadErrors=23
+Current sector: 357544. This session: NewSectorsReadOK=357520, ReadErrors=24
+Current sector: 357545. This session: NewSectorsReadOK=357520, ReadErrors=25
+Current sector: 357546. This session: NewSectorsReadOK=357520, ReadErrors=26
+Current sector: 357547. This session: NewSectorsReadOK=357520, ReadErrors=27
+Current sector: 357548. This session: NewSectorsReadOK=357520, ReadErrors=28
+Current sector: 357549. This session: NewSectorsReadOK=357520, ReadErrors=29
+Current sector: 357550. This session: NewSectorsReadOK=357520, ReadErrors=30
+Current sector: 357551. This session: NewSectorsReadOK=357520, ReadErrors=31
+Current sector: 357552. This session: NewSectorsReadOK=357520, ReadErrors=32
+Current sector: 357552. This session: NewSectorsReadOK=357520, ReadErrors=32
 Sector 357552, try 1: Illegal Request; Logical block address out of range.
 Sector 357552: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357553. This session: NewSectorsReadOK=357520, ReadErrors=33
+Current sector: 357554. This session: NewSectorsReadOK=357520, ReadErrors=34
+Current sector: 357555. This session: NewSectorsReadOK=357520, ReadErrors=35
+Current sector: 357556. This session: NewSectorsReadOK=357520, ReadErrors=36
+Current sector: 357557. This session: NewSectorsReadOK=357520, ReadErrors=37
+Current sector: 357558. This session: NewSectorsReadOK=357520, ReadErrors=38
+Current sector: 357559. This session: NewSectorsReadOK=357520, ReadErrors=39
+Current sector: 357560. This session: NewSectorsReadOK=357520, ReadErrors=40
+Current sector: 357561. This session: NewSectorsReadOK=357520, ReadErrors=41
+Current sector: 357562. This session: NewSectorsReadOK=357520, ReadErrors=42
+Current sector: 357563. This session: NewSectorsReadOK=357520, ReadErrors=43
+Current sector: 357564. This session: NewSectorsReadOK=357520, ReadErrors=44
+Current sector: 357565. This session: NewSectorsReadOK=357520, ReadErrors=45
+Current sector: 357566. This session: NewSectorsReadOK=357520, ReadErrors=46
+Current sector: 357567. This session: NewSectorsReadOK=357520, ReadErrors=47
+Current sector: 357568. This session: NewSectorsReadOK=357520, ReadErrors=48
+Current sector: 357568. This session: NewSectorsReadOK=357520, ReadErrors=48
 Sector 357568, try 1: Illegal Request; Logical block address out of range.
 Sector 357568: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357569. This session: NewSectorsReadOK=357520, ReadErrors=49
+Current sector: 357570. This session: NewSectorsReadOK=357520, ReadErrors=50
+Current sector: 357571. This session: NewSectorsReadOK=357520, ReadErrors=51
+Current sector: 357572. This session: NewSectorsReadOK=357520, ReadErrors=52
+Current sector: 357573. This session: NewSectorsReadOK=357520, ReadErrors=53
+Current sector: 357574. This session: NewSectorsReadOK=357520, ReadErrors=54
+Current sector: 357575. This session: NewSectorsReadOK=357520, ReadErrors=55
+Current sector: 357576. This session: NewSectorsReadOK=357520, ReadErrors=56
+Current sector: 357577. This session: NewSectorsReadOK=357520, ReadErrors=57
+Current sector: 357578. This session: NewSectorsReadOK=357520, ReadErrors=58
+Current sector: 357579. This session: NewSectorsReadOK=357520, ReadErrors=59
+Current sector: 357580. This session: NewSectorsReadOK=357520, ReadErrors=60
+Current sector: 357581. This session: NewSectorsReadOK=357520, ReadErrors=61
+Current sector: 357582. This session: NewSectorsReadOK=357520, ReadErrors=62
+Current sector: 357583. This session: NewSectorsReadOK=357520, ReadErrors=63
+Current sector: 357584. This session: NewSectorsReadOK=357520, ReadErrors=64
+Current sector: 357584. This session: NewSectorsReadOK=357520, ReadErrors=64
 Sector 357584, try 1: Illegal Request; Logical block address out of range.
 Sector 357584: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357585. This session: NewSectorsReadOK=357520, ReadErrors=65
+Current sector: 357586. This session: NewSectorsReadOK=357520, ReadErrors=66
+Current sector: 357587. This session: NewSectorsReadOK=357520, ReadErrors=67
+Current sector: 357588. This session: NewSectorsReadOK=357520, ReadErrors=68
+Current sector: 357589. This session: NewSectorsReadOK=357520, ReadErrors=69
+Current sector: 357590. This session: NewSectorsReadOK=357520, ReadErrors=70
+Current sector: 357591. This session: NewSectorsReadOK=357520, ReadErrors=71
+Current sector: 357592. This session: NewSectorsReadOK=357520, ReadErrors=72
+Current sector: 357593. This session: NewSectorsReadOK=357520, ReadErrors=73
+Current sector: 357594. This session: NewSectorsReadOK=357520, ReadErrors=74
+Current sector: 357595. This session: NewSectorsReadOK=357520, ReadErrors=75
+Current sector: 357596. This session: NewSectorsReadOK=357520, ReadErrors=76
+Current sector: 357597. This session: NewSectorsReadOK=357520, ReadErrors=77
+Current sector: 357598. This session: NewSectorsReadOK=357520, ReadErrors=78
+Current sector: 357599. This session: NewSectorsReadOK=357520, ReadErrors=79
+Current sector: 357600. This session: NewSectorsReadOK=357520, ReadErrors=80
+Current sector: 357600. This session: NewSectorsReadOK=357520, ReadErrors=80
 Sector 357600, try 1: Illegal Request; Logical block address out of range.
 Sector 357600: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357601. This session: NewSectorsReadOK=357520, ReadErrors=81
+Current sector: 357602. This session: NewSectorsReadOK=357520, ReadErrors=82
+Current sector: 357603. This session: NewSectorsReadOK=357520, ReadErrors=83
+Current sector: 357604. This session: NewSectorsReadOK=357520, ReadErrors=84
+Current sector: 357605. This session: NewSectorsReadOK=357520, ReadErrors=85
+Current sector: 357606. This session: NewSectorsReadOK=357520, ReadErrors=86
+Current sector: 357607. This session: NewSectorsReadOK=357520, ReadErrors=87
+Current sector: 357608. This session: NewSectorsReadOK=357520, ReadErrors=88
+Current sector: 357609. This session: NewSectorsReadOK=357520, ReadErrors=89
+Current sector: 357610. This session: NewSectorsReadOK=357520, ReadErrors=90
+Current sector: 357611. This session: NewSectorsReadOK=357520, ReadErrors=91
+Current sector: 357612. This session: NewSectorsReadOK=357520, ReadErrors=92
+Current sector: 357613. This session: NewSectorsReadOK=357520, ReadErrors=93
+Current sector: 357614. This session: NewSectorsReadOK=357520, ReadErrors=94
+Current sector: 357615. This session: NewSectorsReadOK=357520, ReadErrors=95
+Current sector: 357616. This session: NewSectorsReadOK=357520, ReadErrors=96
+Current sector: 357616. This session: NewSectorsReadOK=357520, ReadErrors=96
 Sector 357616, try 1: Illegal Request; Logical block address out of range.
 Sector 357616: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357617. This session: NewSectorsReadOK=357520, ReadErrors=97
+Current sector: 357618. This session: NewSectorsReadOK=357520, ReadErrors=98
+Current sector: 357619. This session: NewSectorsReadOK=357520, ReadErrors=99
+Current sector: 357620. This session: NewSectorsReadOK=357520, ReadErrors=100
+Current sector: 357621. This session: NewSectorsReadOK=357520, ReadErrors=101
+Current sector: 357622. This session: NewSectorsReadOK=357520, ReadErrors=102
+Current sector: 357623. This session: NewSectorsReadOK=357520, ReadErrors=103
+Current sector: 357624. This session: NewSectorsReadOK=357520, ReadErrors=104
+Current sector: 357625. This session: NewSectorsReadOK=357520, ReadErrors=105
+Current sector: 357626. This session: NewSectorsReadOK=357520, ReadErrors=106
+Current sector: 357627. This session: NewSectorsReadOK=357520, ReadErrors=107
+Current sector: 357628. This session: NewSectorsReadOK=357520, ReadErrors=108
+Current sector: 357629. This session: NewSectorsReadOK=357520, ReadErrors=109
+Current sector: 357630. This session: NewSectorsReadOK=357520, ReadErrors=110
+Current sector: 357631. This session: NewSectorsReadOK=357520, ReadErrors=111
+Current sector: 357632. This session: NewSectorsReadOK=357520, ReadErrors=112
+Current sector: 357632. This session: NewSectorsReadOK=357520, ReadErrors=112
 Sector 357632, try 1: Illegal Request; Logical block address out of range.
 Sector 357632: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357633. This session: NewSectorsReadOK=357520, ReadErrors=113
+Current sector: 357634. This session: NewSectorsReadOK=357520, ReadErrors=114
+Current sector: 357635. This session: NewSectorsReadOK=357520, ReadErrors=115
+Current sector: 357636. This session: NewSectorsReadOK=357520, ReadErrors=116
+Current sector: 357637. This session: NewSectorsReadOK=357520, ReadErrors=117
+Current sector: 357638. This session: NewSectorsReadOK=357520, ReadErrors=118
+Current sector: 357639. This session: NewSectorsReadOK=357520, ReadErrors=119
+Current sector: 357640. This session: NewSectorsReadOK=357520, ReadErrors=120
+Current sector: 357641. This session: NewSectorsReadOK=357520, ReadErrors=121
+Current sector: 357642. This session: NewSectorsReadOK=357520, ReadErrors=122
+Current sector: 357643. This session: NewSectorsReadOK=357520, ReadErrors=123
+Current sector: 357644. This session: NewSectorsReadOK=357520, ReadErrors=124
+Current sector: 357645. This session: NewSectorsReadOK=357520, ReadErrors=125
+Current sector: 357646. This session: NewSectorsReadOK=357520, ReadErrors=126
+Current sector: 357647. This session: NewSectorsReadOK=357520, ReadErrors=127
+Current sector: 357648. This session: NewSectorsReadOK=357520, ReadErrors=128
+Current sector: 357648. This session: NewSectorsReadOK=357520, ReadErrors=128
 Sector 357648, try 1: Illegal Request; Logical block address out of range.
 Sector 357648: Illegal Request; Logical block address out of range.
+Current sector: 357649. This session: NewSectorsReadOK=357520, ReadErrors=129
 Sector 357649, try 1: Illegal Request; Logical block address out of range.
 Sector 357649: Illegal Request; Logical block address out of range.
+Current sector: 357650. This session: NewSectorsReadOK=357520, ReadErrors=130
 Sector 357650, try 1: Illegal Request; Logical block address out of range.
 Sector 357650: Illegal Request; Logical block address out of range.
+Current sector: 357651. This session: NewSectorsReadOK=357520, ReadErrors=131
 Sector 357651, try 1: Illegal Request; Logical block address out of range.
 Sector 357651: Illegal Request; Logical block address out of range.
+Current sector: 357652. This session: NewSectorsReadOK=357520, ReadErrors=132
 Sector 357652, try 1: Illegal Request; Logical block address out of range.
 Sector 357652: Illegal Request; Logical block address out of range.
+Current sector: 357653. This session: NewSectorsReadOK=357520, ReadErrors=133
 Sector 357653, try 1: Illegal Request; Logical block address out of range.
 Sector 357653: Illegal Request; Logical block address out of range.
+Current sector: 357654. This session: NewSectorsReadOK=357520, ReadErrors=134
 Sector 357654, try 1: Illegal Request; Logical block address out of range.
 Sector 357654: Illegal Request; Logical block address out of range.
+Current sector: 357655. This session: NewSectorsReadOK=357520, ReadErrors=135

 135 unreadable sectors.
 CrcBuf contents, image path none (medium):
--- a/regtest/database/RS02_read_modulo_glitch4
+++ b/regtest/database/RS02_read_modulo_glitch4
--- a/regtest/database/RS02_read_shorter
+++ b/regtest/database/RS02_read_shorter
@@ -114,18 +114,73 @@ Reading CRC information from ecc data (RS02) ... RS02LayoutFromImage(): returnin
 done.
 Sector 34880, try 1: Illegal Request; Logical block address out of range.
 Sector 34880: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 34881. This session: NewSectorsReadOK=34880, ReadErrors=1
+Current sector: 34882. This session: NewSectorsReadOK=34880, ReadErrors=2
+Current sector: 34883. This session: NewSectorsReadOK=34880, ReadErrors=3
+Current sector: 34884. This session: NewSectorsReadOK=34880, ReadErrors=4
+Current sector: 34885. This session: NewSectorsReadOK=34880, ReadErrors=5
+Current sector: 34886. This session: NewSectorsReadOK=34880, ReadErrors=6
+Current sector: 34887. This session: NewSectorsReadOK=34880, ReadErrors=7
+Current sector: 34888. This session: NewSectorsReadOK=34880, ReadErrors=8
+Current sector: 34889. This session: NewSectorsReadOK=34880, ReadErrors=9
+Current sector: 34890. This session: NewSectorsReadOK=34880, ReadErrors=10
+Current sector: 34891. This session: NewSectorsReadOK=34880, ReadErrors=11
+Current sector: 34892. This session: NewSectorsReadOK=34880, ReadErrors=12
+Current sector: 34893. This session: NewSectorsReadOK=34880, ReadErrors=13
+Current sector: 34894. This session: NewSectorsReadOK=34880, ReadErrors=14
+Current sector: 34895. This session: NewSectorsReadOK=34880, ReadErrors=15
+Current sector: 34896. This session: NewSectorsReadOK=34880, ReadErrors=16
+Current sector: 34896. This session: NewSectorsReadOK=34880, ReadErrors=16
 Sector 34896, try 1: Illegal Request; Logical block address out of range.
 Sector 34896: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 34897. This session: NewSectorsReadOK=34880, ReadErrors=17
+Current sector: 34898. This session: NewSectorsReadOK=34880, ReadErrors=18
+Current sector: 34899. This session: NewSectorsReadOK=34880, ReadErrors=19
+Current sector: 34900. This session: NewSectorsReadOK=34880, ReadErrors=20
+Current sector: 34901. This session: NewSectorsReadOK=34880, ReadErrors=21
+Current sector: 34902. This session: NewSectorsReadOK=34880, ReadErrors=22
+Current sector: 34903. This session: NewSectorsReadOK=34880, ReadErrors=23
+Current sector: 34904. This session: NewSectorsReadOK=34880, ReadErrors=24
+Current sector: 34905. This session: NewSectorsReadOK=34880, ReadErrors=25
+Current sector: 34906. This session: NewSectorsReadOK=34880, ReadErrors=26
+Current sector: 34907. This session: NewSectorsReadOK=34880, ReadErrors=27
+Current sector: 34908. This session: NewSectorsReadOK=34880, ReadErrors=28
+Current sector: 34909. This session: NewSectorsReadOK=34880, ReadErrors=29
+Current sector: 34910. This session: NewSectorsReadOK=34880, ReadErrors=30
+Current sector: 34911. This session: NewSectorsReadOK=34880, ReadErrors=31
+Current sector: 34912. This session: NewSectorsReadOK=34880, ReadErrors=32
+Current sector: 34912. This session: NewSectorsReadOK=34880, ReadErrors=32
 Sector 34912, try 1: Illegal Request; Logical block address out of range.
 Sector 34912: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 34913. This session: NewSectorsReadOK=34880, ReadErrors=33
+Current sector: 34914. This session: NewSectorsReadOK=34880, ReadErrors=34
+Current sector: 34915. This session: NewSectorsReadOK=34880, ReadErrors=35
+Current sector: 34916. This session: NewSectorsReadOK=34880, ReadErrors=36
+Current sector: 34917. This session: NewSectorsReadOK=34880, ReadErrors=37
+Current sector: 34918. This session: NewSectorsReadOK=34880, ReadErrors=38
+Current sector: 34919. This session: NewSectorsReadOK=34880, ReadErrors=39
+Current sector: 34920. This session: NewSectorsReadOK=34880, ReadErrors=40
+Current sector: 34921. This session: NewSectorsReadOK=34880, ReadErrors=41
+Current sector: 34922. This session: NewSectorsReadOK=34880, ReadErrors=42
+Current sector: 34923. This session: NewSectorsReadOK=34880, ReadErrors=43
+Current sector: 34924. This session: NewSectorsReadOK=34880, ReadErrors=44
+Current sector: 34925. This session: NewSectorsReadOK=34880, ReadErrors=45
+Current sector: 34926. This session: NewSectorsReadOK=34880, ReadErrors=46
+Current sector: 34927. This session: NewSectorsReadOK=34880, ReadErrors=47
+Current sector: 34928. This session: NewSectorsReadOK=34880, ReadErrors=48
+Current sector: 34928. This session: NewSectorsReadOK=34880, ReadErrors=48
 Sector 34928, try 1: Illegal Request; Logical block address out of range.
 Sector 34928: Illegal Request; Logical block address out of range.
+Current sector: 34929. This session: NewSectorsReadOK=34880, ReadErrors=49
 Sector 34929, try 1: Illegal Request; Logical block address out of range.
 Sector 34929: Illegal Request; Logical block address out of range.
+Current sector: 34930. This session: NewSectorsReadOK=34880, ReadErrors=50
 Sector 34930, try 1: Illegal Request; Logical block address out of range.
 Sector 34930: Illegal Request; Logical block address out of range.
+Current sector: 34931. This session: NewSectorsReadOK=34880, ReadErrors=51
 Sector 34931, try 1: Illegal Request; Logical block address out of range.
 Sector 34931: Illegal Request; Logical block address out of range.
+Current sector: 34932. This session: NewSectorsReadOK=34880, ReadErrors=52

 52 unreadable sectors.
 CrcBuf contents, image path none (medium):
--- a/regtest/database/RS02_scan_modulo_glitch3
+++ b/regtest/database/RS02_scan_modulo_glitch3
@@ -116,34 +116,177 @@ Reading CRC information from ecc data (RS02) ... RS02LayoutFromImage(): returnin
 done.
 Sector 357520, try 1: Illegal Request; Logical block address out of range.
 Sector 357520: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357521. This session: NewSectorsReadOK=357520, ReadErrors=1
+Current sector: 357522. This session: NewSectorsReadOK=357520, ReadErrors=2
+Current sector: 357523. This session: NewSectorsReadOK=357520, ReadErrors=3
+Current sector: 357524. This session: NewSectorsReadOK=357520, ReadErrors=4
+Current sector: 357525. This session: NewSectorsReadOK=357520, ReadErrors=5
+Current sector: 357526. This session: NewSectorsReadOK=357520, ReadErrors=6
+Current sector: 357527. This session: NewSectorsReadOK=357520, ReadErrors=7
+Current sector: 357528. This session: NewSectorsReadOK=357520, ReadErrors=8
+Current sector: 357529. This session: NewSectorsReadOK=357520, ReadErrors=9
+Current sector: 357530. This session: NewSectorsReadOK=357520, ReadErrors=10
+Current sector: 357531. This session: NewSectorsReadOK=357520, ReadErrors=11
+Current sector: 357532. This session: NewSectorsReadOK=357520, ReadErrors=12
+Current sector: 357533. This session: NewSectorsReadOK=357520, ReadErrors=13
+Current sector: 357534. This session: NewSectorsReadOK=357520, ReadErrors=14
+Current sector: 357535. This session: NewSectorsReadOK=357520, ReadErrors=15
+Current sector: 357536. This session: NewSectorsReadOK=357520, ReadErrors=16
+Current sector: 357536. This session: NewSectorsReadOK=357520, ReadErrors=16
 Sector 357536, try 1: Illegal Request; Logical block address out of range.
 Sector 357536: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357537. This session: NewSectorsReadOK=357520, ReadErrors=17
+Current sector: 357538. This session: NewSectorsReadOK=357520, ReadErrors=18
+Current sector: 357539. This session: NewSectorsReadOK=357520, ReadErrors=19
+Current sector: 357540. This session: NewSectorsReadOK=357520, ReadErrors=20
+Current sector: 357541. This session: NewSectorsReadOK=357520, ReadErrors=21
+Current sector: 357542. This session: NewSectorsReadOK=357520, ReadErrors=22
+Current sector: 357543. This session: NewSectorsReadOK=357520, ReadErrors=23
+Current sector: 357544. This session: NewSectorsReadOK=357520, ReadErrors=24
+Current sector: 357545. This session: NewSectorsReadOK=357520, ReadErrors=25
+Current sector: 357546. This session: NewSectorsReadOK=357520, ReadErrors=26
+Current sector: 357547. This session: NewSectorsReadOK=357520, ReadErrors=27
+Current sector: 357548. This session: NewSectorsReadOK=357520, ReadErrors=28
+Current sector: 357549. This session: NewSectorsReadOK=357520, ReadErrors=29
+Current sector: 357550. This session: NewSectorsReadOK=357520, ReadErrors=30
+Current sector: 357551. This session: NewSectorsReadOK=357520, ReadErrors=31
+Current sector: 357552. This session: NewSectorsReadOK=357520, ReadErrors=32
+Current sector: 357552. This session: NewSectorsReadOK=357520, ReadErrors=32
 Sector 357552, try 1: Illegal Request; Logical block address out of range.
 Sector 357552: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357553. This session: NewSectorsReadOK=357520, ReadErrors=33
+Current sector: 357554. This session: NewSectorsReadOK=357520, ReadErrors=34
+Current sector: 357555. This session: NewSectorsReadOK=357520, ReadErrors=35
+Current sector: 357556. This session: NewSectorsReadOK=357520, ReadErrors=36
+Current sector: 357557. This session: NewSectorsReadOK=357520, ReadErrors=37
+Current sector: 357558. This session: NewSectorsReadOK=357520, ReadErrors=38
+Current sector: 357559. This session: NewSectorsReadOK=357520, ReadErrors=39
+Current sector: 357560. This session: NewSectorsReadOK=357520, ReadErrors=40
+Current sector: 357561. This session: NewSectorsReadOK=357520, ReadErrors=41
+Current sector: 357562. This session: NewSectorsReadOK=357520, ReadErrors=42
+Current sector: 357563. This session: NewSectorsReadOK=357520, ReadErrors=43
+Current sector: 357564. This session: NewSectorsReadOK=357520, ReadErrors=44
+Current sector: 357565. This session: NewSectorsReadOK=357520, ReadErrors=45
+Current sector: 357566. This session: NewSectorsReadOK=357520, ReadErrors=46
+Current sector: 357567. This session: NewSectorsReadOK=357520, ReadErrors=47
+Current sector: 357568. This session: NewSectorsReadOK=357520, ReadErrors=48
+Current sector: 357568. This session: NewSectorsReadOK=357520, ReadErrors=48
 Sector 357568, try 1: Illegal Request; Logical block address out of range.
 Sector 357568: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357569. This session: NewSectorsReadOK=357520, ReadErrors=49
+Current sector: 357570. This session: NewSectorsReadOK=357520, ReadErrors=50
+Current sector: 357571. This session: NewSectorsReadOK=357520, ReadErrors=51
+Current sector: 357572. This session: NewSectorsReadOK=357520, ReadErrors=52
+Current sector: 357573. This session: NewSectorsReadOK=357520, ReadErrors=53
+Current sector: 357574. This session: NewSectorsReadOK=357520, ReadErrors=54
+Current sector: 357575. This session: NewSectorsReadOK=357520, ReadErrors=55
+Current sector: 357576. This session: NewSectorsReadOK=357520, ReadErrors=56
+Current sector: 357577. This session: NewSectorsReadOK=357520, ReadErrors=57
+Current sector: 357578. This session: NewSectorsReadOK=357520, ReadErrors=58
+Current sector: 357579. This session: NewSectorsReadOK=357520, ReadErrors=59
+Current sector: 357580. This session: NewSectorsReadOK=357520, ReadErrors=60
+Current sector: 357581. This session: NewSectorsReadOK=357520, ReadErrors=61
+Current sector: 357582. This session: NewSectorsReadOK=357520, ReadErrors=62
+Current sector: 357583. This session: NewSectorsReadOK=357520, ReadErrors=63
+Current sector: 357584. This session: NewSectorsReadOK=357520, ReadErrors=64
+Current sector: 357584. This session: NewSectorsReadOK=357520, ReadErrors=64
 Sector 357584, try 1: Illegal Request; Logical block address out of range.
 Sector 357584: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357585. This session: NewSectorsReadOK=357520, ReadErrors=65
+Current sector: 357586. This session: NewSectorsReadOK=357520, ReadErrors=66
+Current sector: 357587. This session: NewSectorsReadOK=357520, ReadErrors=67
+Current sector: 357588. This session: NewSectorsReadOK=357520, ReadErrors=68
+Current sector: 357589. This session: NewSectorsReadOK=357520, ReadErrors=69
+Current sector: 357590. This session: NewSectorsReadOK=357520, ReadErrors=70
+Current sector: 357591. This session: NewSectorsReadOK=357520, ReadErrors=71
+Current sector: 357592. This session: NewSectorsReadOK=357520, ReadErrors=72
+Current sector: 357593. This session: NewSectorsReadOK=357520, ReadErrors=73
+Current sector: 357594. This session: NewSectorsReadOK=357520, ReadErrors=74
+Current sector: 357595. This session: NewSectorsReadOK=357520, ReadErrors=75
+Current sector: 357596. This session: NewSectorsReadOK=357520, ReadErrors=76
+Current sector: 357597. This session: NewSectorsReadOK=357520, ReadErrors=77
+Current sector: 357598. This session: NewSectorsReadOK=357520, ReadErrors=78
+Current sector: 357599. This session: NewSectorsReadOK=357520, ReadErrors=79
+Current sector: 357600. This session: NewSectorsReadOK=357520, ReadErrors=80
+Current sector: 357600. This session: NewSectorsReadOK=357520, ReadErrors=80
 Sector 357600, try 1: Illegal Request; Logical block address out of range.
 Sector 357600: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357601. This session: NewSectorsReadOK=357520, ReadErrors=81
+Current sector: 357602. This session: NewSectorsReadOK=357520, ReadErrors=82
+Current sector: 357603. This session: NewSectorsReadOK=357520, ReadErrors=83
+Current sector: 357604. This session: NewSectorsReadOK=357520, ReadErrors=84
+Current sector: 357605. This session: NewSectorsReadOK=357520, ReadErrors=85
+Current sector: 357606. This session: NewSectorsReadOK=357520, ReadErrors=86
+Current sector: 357607. This session: NewSectorsReadOK=357520, ReadErrors=87
+Current sector: 357608. This session: NewSectorsReadOK=357520, ReadErrors=88
+Current sector: 357609. This session: NewSectorsReadOK=357520, ReadErrors=89
+Current sector: 357610. This session: NewSectorsReadOK=357520, ReadErrors=90
+Current sector: 357611. This session: NewSectorsReadOK=357520, ReadErrors=91
+Current sector: 357612. This session: NewSectorsReadOK=357520, ReadErrors=92
+Current sector: 357613. This session: NewSectorsReadOK=357520, ReadErrors=93
+Current sector: 357614. This session: NewSectorsReadOK=357520, ReadErrors=94
+Current sector: 357615. This session: NewSectorsReadOK=357520, ReadErrors=95
+Current sector: 357616. This session: NewSectorsReadOK=357520, ReadErrors=96
+Current sector: 357616. This session: NewSectorsReadOK=357520, ReadErrors=96
 Sector 357616, try 1: Illegal Request; Logical block address out of range.
 Sector 357616: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357617. This session: NewSectorsReadOK=357520, ReadErrors=97
+Current sector: 357618. This session: NewSectorsReadOK=357520, ReadErrors=98
+Current sector: 357619. This session: NewSectorsReadOK=357520, ReadErrors=99
+Current sector: 357620. This session: NewSectorsReadOK=357520, ReadErrors=100
+Current sector: 357621. This session: NewSectorsReadOK=357520, ReadErrors=101
+Current sector: 357622. This session: NewSectorsReadOK=357520, ReadErrors=102
+Current sector: 357623. This session: NewSectorsReadOK=357520, ReadErrors=103
+Current sector: 357624. This session: NewSectorsReadOK=357520, ReadErrors=104
+Current sector: 357625. This session: NewSectorsReadOK=357520, ReadErrors=105
+Current sector: 357626. This session: NewSectorsReadOK=357520, ReadErrors=106
+Current sector: 357627. This session: NewSectorsReadOK=357520, ReadErrors=107
+Current sector: 357628. This session: NewSectorsReadOK=357520, ReadErrors=108
+Current sector: 357629. This session: NewSectorsReadOK=357520, ReadErrors=109
+Current sector: 357630. This session: NewSectorsReadOK=357520, ReadErrors=110
+Current sector: 357631. This session: NewSectorsReadOK=357520, ReadErrors=111
+Current sector: 357632. This session: NewSectorsReadOK=357520, ReadErrors=112
+Current sector: 357632. This session: NewSectorsReadOK=357520, ReadErrors=112
 Sector 357632, try 1: Illegal Request; Logical block address out of range.
 Sector 357632: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357633. This session: NewSectorsReadOK=357520, ReadErrors=113
+Current sector: 357634. This session: NewSectorsReadOK=357520, ReadErrors=114
+Current sector: 357635. This session: NewSectorsReadOK=357520, ReadErrors=115
+Current sector: 357636. This session: NewSectorsReadOK=357520, ReadErrors=116
+Current sector: 357637. This session: NewSectorsReadOK=357520, ReadErrors=117
+Current sector: 357638. This session: NewSectorsReadOK=357520, ReadErrors=118
+Current sector: 357639. This session: NewSectorsReadOK=357520, ReadErrors=119
+Current sector: 357640. This session: NewSectorsReadOK=357520, ReadErrors=120
+Current sector: 357641. This session: NewSectorsReadOK=357520, ReadErrors=121
+Current sector: 357642. This session: NewSectorsReadOK=357520, ReadErrors=122
+Current sector: 357643. This session: NewSectorsReadOK=357520, ReadErrors=123
+Current sector: 357644. This session: NewSectorsReadOK=357520, ReadErrors=124
+Current sector: 357645. This session: NewSectorsReadOK=357520, ReadErrors=125
+Current sector: 357646. This session: NewSectorsReadOK=357520, ReadErrors=126
+Current sector: 357647. This session: NewSectorsReadOK=357520, ReadErrors=127
+Current sector: 357648. This session: NewSectorsReadOK=357520, ReadErrors=128
+Current sector: 357648. This session: NewSectorsReadOK=357520, ReadErrors=128
 Sector 357648, try 1: Illegal Request; Logical block address out of range.
 Sector 357648: Illegal Request; Logical block address out of range.
+Current sector: 357649. This session: NewSectorsReadOK=357520, ReadErrors=129
 Sector 357649, try 1: Illegal Request; Logical block address out of range.
 Sector 357649: Illegal Request; Logical block address out of range.
+Current sector: 357650. This session: NewSectorsReadOK=357520, ReadErrors=130
 Sector 357650, try 1: Illegal Request; Logical block address out of range.
 Sector 357650: Illegal Request; Logical block address out of range.
+Current sector: 357651. This session: NewSectorsReadOK=357520, ReadErrors=131
 Sector 357651, try 1: Illegal Request; Logical block address out of range.
 Sector 357651: Illegal Request; Logical block address out of range.
+Current sector: 357652. This session: NewSectorsReadOK=357520, ReadErrors=132
 Sector 357652, try 1: Illegal Request; Logical block address out of range.
 Sector 357652: Illegal Request; Logical block address out of range.
+Current sector: 357653. This session: NewSectorsReadOK=357520, ReadErrors=133
 Sector 357653, try 1: Illegal Request; Logical block address out of range.
 Sector 357653: Illegal Request; Logical block address out of range.
+Current sector: 357654. This session: NewSectorsReadOK=357520, ReadErrors=134
 Sector 357654, try 1: Illegal Request; Logical block address out of range.
 Sector 357654: Illegal Request; Logical block address out of range.
+Current sector: 357655. This session: NewSectorsReadOK=357520, ReadErrors=135

 135 unreadable sectors.
 CrcBuf contents, image path none (medium):
--- a/regtest/database/RS02_scan_modulo_glitch4
+++ b/regtest/database/RS02_scan_modulo_glitch4
--- a/regtest/database/RS02_scan_shorter
+++ b/regtest/database/RS02_scan_shorter
@@ -114,18 +114,73 @@ Reading CRC information from ecc data (RS02) ... RS02LayoutFromImage(): returnin
 done.
 Sector 34880, try 1: Illegal Request; Logical block address out of range.
 Sector 34880: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 34881. This session: NewSectorsReadOK=34880, ReadErrors=1
+Current sector: 34882. This session: NewSectorsReadOK=34880, ReadErrors=2
+Current sector: 34883. This session: NewSectorsReadOK=34880, ReadErrors=3
+Current sector: 34884. This session: NewSectorsReadOK=34880, ReadErrors=4
+Current sector: 34885. This session: NewSectorsReadOK=34880, ReadErrors=5
+Current sector: 34886. This session: NewSectorsReadOK=34880, ReadErrors=6
+Current sector: 34887. This session: NewSectorsReadOK=34880, ReadErrors=7
+Current sector: 34888. This session: NewSectorsReadOK=34880, ReadErrors=8
+Current sector: 34889. This session: NewSectorsReadOK=34880, ReadErrors=9
+Current sector: 34890. This session: NewSectorsReadOK=34880, ReadErrors=10
+Current sector: 34891. This session: NewSectorsReadOK=34880, ReadErrors=11
+Current sector: 34892. This session: NewSectorsReadOK=34880, ReadErrors=12
+Current sector: 34893. This session: NewSectorsReadOK=34880, ReadErrors=13
+Current sector: 34894. This session: NewSectorsReadOK=34880, ReadErrors=14
+Current sector: 34895. This session: NewSectorsReadOK=34880, ReadErrors=15
+Current sector: 34896. This session: NewSectorsReadOK=34880, ReadErrors=16
+Current sector: 34896. This session: NewSectorsReadOK=34880, ReadErrors=16
 Sector 34896, try 1: Illegal Request; Logical block address out of range.
 Sector 34896: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 34897. This session: NewSectorsReadOK=34880, ReadErrors=17
+Current sector: 34898. This session: NewSectorsReadOK=34880, ReadErrors=18
+Current sector: 34899. This session: NewSectorsReadOK=34880, ReadErrors=19
+Current sector: 34900. This session: NewSectorsReadOK=34880, ReadErrors=20
+Current sector: 34901. This session: NewSectorsReadOK=34880, ReadErrors=21
+Current sector: 34902. This session: NewSectorsReadOK=34880, ReadErrors=22
+Current sector: 34903. This session: NewSectorsReadOK=34880, ReadErrors=23
+Current sector: 34904. This session: NewSectorsReadOK=34880, ReadErrors=24
+Current sector: 34905. This session: NewSectorsReadOK=34880, ReadErrors=25
+Current sector: 34906. This session: NewSectorsReadOK=34880, ReadErrors=26
+Current sector: 34907. This session: NewSectorsReadOK=34880, ReadErrors=27
+Current sector: 34908. This session: NewSectorsReadOK=34880, ReadErrors=28
+Current sector: 34909. This session: NewSectorsReadOK=34880, ReadErrors=29
+Current sector: 34910. This session: NewSectorsReadOK=34880, ReadErrors=30
+Current sector: 34911. This session: NewSectorsReadOK=34880, ReadErrors=31
+Current sector: 34912. This session: NewSectorsReadOK=34880, ReadErrors=32
+Current sector: 34912. This session: NewSectorsReadOK=34880, ReadErrors=32
 Sector 34912, try 1: Illegal Request; Logical block address out of range.
 Sector 34912: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 34913. This session: NewSectorsReadOK=34880, ReadErrors=33
+Current sector: 34914. This session: NewSectorsReadOK=34880, ReadErrors=34
+Current sector: 34915. This session: NewSectorsReadOK=34880, ReadErrors=35
+Current sector: 34916. This session: NewSectorsReadOK=34880, ReadErrors=36
+Current sector: 34917. This session: NewSectorsReadOK=34880, ReadErrors=37
+Current sector: 34918. This session: NewSectorsReadOK=34880, ReadErrors=38
+Current sector: 34919. This session: NewSectorsReadOK=34880, ReadErrors=39
+Current sector: 34920. This session: NewSectorsReadOK=34880, ReadErrors=40
+Current sector: 34921. This session: NewSectorsReadOK=34880, ReadErrors=41
+Current sector: 34922. This session: NewSectorsReadOK=34880, ReadErrors=42
+Current sector: 34923. This session: NewSectorsReadOK=34880, ReadErrors=43
+Current sector: 34924. This session: NewSectorsReadOK=34880, ReadErrors=44
+Current sector: 34925. This session: NewSectorsReadOK=34880, ReadErrors=45
+Current sector: 34926. This session: NewSectorsReadOK=34880, ReadErrors=46
+Current sector: 34927. This session: NewSectorsReadOK=34880, ReadErrors=47
+Current sector: 34928. This session: NewSectorsReadOK=34880, ReadErrors=48
+Current sector: 34928. This session: NewSectorsReadOK=34880, ReadErrors=48
 Sector 34928, try 1: Illegal Request; Logical block address out of range.
 Sector 34928: Illegal Request; Logical block address out of range.
+Current sector: 34929. This session: NewSectorsReadOK=34880, ReadErrors=49
 Sector 34929, try 1: Illegal Request; Logical block address out of range.
 Sector 34929: Illegal Request; Logical block address out of range.
+Current sector: 34930. This session: NewSectorsReadOK=34880, ReadErrors=50
 Sector 34930, try 1: Illegal Request; Logical block address out of range.
 Sector 34930: Illegal Request; Logical block address out of range.
+Current sector: 34931. This session: NewSectorsReadOK=34880, ReadErrors=51
 Sector 34931, try 1: Illegal Request; Logical block address out of range.
 Sector 34931: Illegal Request; Logical block address out of range.
+Current sector: 34932. This session: NewSectorsReadOK=34880, ReadErrors=52

 52 unreadable sectors.
 CrcBuf contents, image path none (medium):
--- a/regtest/database/RS02_strip_ecc
+++ b/regtest/database/RS02_strip_ecc
@@ -0,0 +1,75 @@
+cbadac3ca7b6e9bccfc889b7eaded254
+ignore
+This software comes with  ABSOLUTELY NO WARRANTY.  This
+is free software and you are welcome to redistribute it
+under the conditions of the GNU GENERAL PUBLIC LICENSE.
+See the file "COPYING" for further information.
+
+ExamineUDF(File: rs02-tmp.iso)
+ Examining the ISO file system...
+  Sector 16:
+   Volume descriptor type    = 1
+   Volume descriptor version = 1
+   Standard identifier       = CD001
+   -> primary volume descriptor:
+    System identifier         : |                                |
+    Volume identifier         : |RANDOM IMAGE                    |
+    Volume space size         : 30000 sectors
+    Volume set size           : 1
+    Volume sequence size      : 1
+    Logical block size        : 2048
+    Path table size           : 10 bytes
+    L-Path table location     : 19
+    Opt L-Path table location : 0
+    M-Path table location     : 20
+    Opt M-Path table location : 0
+    Volume creation date/time : 16-07-2006 10:35:46.23
+    Volume modification d/t   : 16-07-2006 10:35:46.23
+    Volume expiration d/t     : 16-07-2106 10:35:46.23
+    Volume effective d/t      : 16-07-2006 10:35:46.23
+    File structure version    : 1
+  Sector 17:
+   Volume descriptor type    = 2
+   Volume descriptor version = 1
+   Standard identifier       = CD001
+   -> supplementary volume descriptor: *skipped*
+  Sector 18:
+   Volume descriptor type    = 255
+   Volume descriptor version = 1
+   Standard identifier       = CD001
+   -> volume descriptor set terminator;
+      end of ISO file system parsing.
+ Examining the UDF file system...
+  not yet implemented.
+
+ExamineECC() started
+...trying RS01
+...trying RS02
+RS02Recognize: file rs02-tmp.iso
+try_sector: trying sector 30000
+try_sector: header at 30000: magic cookie found
+try_sector: CRC okay
+GetImageFingerprint(16): read & cached
+try_sector: fingerprint okay, header good
+Root sector search at +0 successful
+...augmented image found
+Expected size calculated from ecc header: 34932
+--> confirmed layout variant 1
+Calculated layout for RS02 image:
+data sectors      = 30000
+crc sectors       = 59
+protected sectors = 30061 (incl. 2 hdr sectors)
+reed solomon secs = 4795 (35 roots, 220 data)
+header repeats    = 38 (using modulo 128)
+added sectors     = 4932
+total image size  = 34932
+medium capacity   = n.a.
+
+Interleaving layout:
+137 sectors per ecc layer
+first layer sector with CRC data 136 (sector# 30002)
+
+GetImageFingerprint(16): cached
+Image is augmented (expected sectors = 34932)
+Truncating image to 30000 sectors.
+Image successfully truncated back to its original size.
--- a/regtest/database/RS02_strip_ecc_not
+++ b/regtest/database/RS02_strip_ecc_not
@@ -0,0 +1,143 @@
+cbadac3ca7b6e9bccfc889b7eaded254
+ignore
+This software comes with  ABSOLUTELY NO WARRANTY.  This
+is free software and you are welcome to redistribute it
+under the conditions of the GNU GENERAL PUBLIC LICENSE.
+See the file "COPYING" for further information.
+
+ExamineUDF(File: rs02-tmp.iso)
+ Examining the ISO file system...
+  Sector 16:
+   Volume descriptor type    = 1
+   Volume descriptor version = 1
+   Standard identifier       = CD001
+   -> primary volume descriptor:
+    System identifier         : |                                |
+    Volume identifier         : |RANDOM IMAGE                    |
+    Volume space size         : 30000 sectors
+    Volume set size           : 1
+    Volume sequence size      : 1
+    Logical block size        : 2048
+    Path table size           : 10 bytes
+    L-Path table location     : 19
+    Opt L-Path table location : 0
+    M-Path table location     : 20
+    Opt M-Path table location : 0
+    Volume creation date/time : 16-07-2006 10:35:46.23
+    Volume modification d/t   : 16-07-2006 10:35:46.23
+    Volume expiration d/t     : 16-07-2106 10:35:46.23
+    Volume effective d/t      : 16-07-2006 10:35:46.23
+    File structure version    : 1
+  Sector 17:
+   Volume descriptor type    = 2
+   Volume descriptor version = 1
+   Standard identifier       = CD001
+   -> supplementary volume descriptor: *skipped*
+  Sector 18:
+   Volume descriptor type    = 255
+   Volume descriptor version = 1
+   Standard identifier       = CD001
+   -> volume descriptor set terminator;
+      end of ISO file system parsing.
+ Examining the UDF file system...
+  not yet implemented.
+
+ExamineECC() started
+...trying RS01
+...trying RS02
+RS02Recognize: file rs02-tmp.iso
+try_sector: trying sector 30000
+try_sector: read error, trying next header
+try_sector: trying sector 29850
+try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+try_sector: trying sector 24576
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 28672
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 28672 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+try_sector: trying sector 29696
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 512
+Sector 29696 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 256
+try_sector: trying sector 29952
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 128
+Sector 29952 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 64
+Sector 29952 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 32
+try_sector: trying sector 29984
+try_sector: no cookie, skipping current modulo
+...trying RS03
+RS03RecognizeImage: file rs02-tmp.iso
+FindRS03HeaderInImage: file rs02-tmp.iso
+RS03RecognizeImage: No EH, entering exhaustive search
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
+...no augmented image detected.
+GetImageFingerprint(16): read & cached
+
+*
+* dvdisaster - can not continue:
+*
+Image is not augmented (no dvdisaster signature found).
+
--- a/regtest/database/RS03f_ecc_create_after_partial_read
+++ b/regtest/database/RS03f_ecc_create_after_partial_read
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -154,6 +222,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS03f_ecc_create_after_read
+++ b/regtest/database/RS03f_ecc_create_after_read
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -155,6 +223,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS03f_ecc_header_crc_error
+++ b/regtest/database/RS03f_ecc_header_crc_error
@@ -50,6 +50,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS03f_ecc_recreate_after_read_rs01
+++ b/regtest/database/RS03f_ecc_recreate_after_read_rs01
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -157,6 +225,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS03f_ecc_recreate_after_read_rs03f
+++ b/regtest/database/RS03f_ecc_recreate_after_read_rs03f
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -171,6 +239,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS03f_ecc_recreate_after_read_rs03i
+++ b/regtest/database/RS03f_ecc_recreate_after_read_rs03i
@@ -84,7 +84,67 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+try_sector: trying sector 22528
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
@@ -167,6 +227,7 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS03f_fix_missing_ecc_header
+++ b/regtest/database/RS03f_fix_missing_ecc_header
@@ -51,6 +51,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS03f_missing_ecc_header
+++ b/regtest/database/RS03f_missing_ecc_header
@@ -50,6 +50,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS03f_missing_ecc_header_and_crc
+++ b/regtest/database/RS03f_missing_ecc_header_and_crc
@@ -50,6 +50,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS03f_missing_ecc_header_and_defective_crc
+++ b/regtest/database/RS03f_missing_ecc_header_and_defective_crc
@@ -50,6 +50,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS03f_read_bad_header
+++ b/regtest/database/RS03f_read_bad_header
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS03f_read_good_verbose
+++ b/regtest/database/RS03f_read_good_verbose
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS03f_read_longer
+++ b/regtest/database/RS03f_read_longer
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS03f_scan_bad_header
+++ b/regtest/database/RS03f_scan_bad_header
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS03f_scan_ecc_header_crc_error
+++ b/regtest/database/RS03f_scan_ecc_header_crc_error
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS03f_scan_good_verbose
+++ b/regtest/database/RS03f_scan_good_verbose
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS03f_scan_longer
+++ b/regtest/database/RS03f_scan_longer
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS03f_scan_missing_ecc_header
+++ b/regtest/database/RS03f_scan_missing_ecc_header
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS03f_scan_missing_ecc_header_and_crc
+++ b/regtest/database/RS03f_scan_missing_ecc_header_and_crc
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS03f_scan_missing_ecc_header_and_defective_crc
+++ b/regtest/database/RS03f_scan_missing_ecc_header_and_defective_crc
@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
--- a/regtest/database/RS03f_special_padding
+++ b/regtest/database/RS03f_special_padding
@@ -50,6 +50,7 @@ try_sector: trying sector 20124
 try_sector: read error, trying next header
 try_sector: trying sector 19974
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS03f_special_padding_plus56
+++ b/regtest/database/RS03f_special_padding_plus56
@@ -50,6 +50,7 @@ try_sector: trying sector 20123
 try_sector: read error, trying next header
 try_sector: trying sector 19973
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS03f_uncorrectable_dsm_in_image2_verbose
+++ b/regtest/database/RS03f_uncorrectable_dsm_in_image2_verbose
@@ -50,6 +50,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS03f_uncorrectable_dsm_in_image_verbose
+++ b/regtest/database/RS03f_uncorrectable_dsm_in_image_verbose
@@ -50,6 +50,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS03i_ecc_create_after_partial_read
+++ b/regtest/database/RS03i_ecc_create_after_partial_read
@@ -84,11 +84,83 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+Warning: image size set to 25000 for debugging!
+.. trying layer size 98
+Scanning layers for signatures.
+- layer slice 0
+RS03: tries left = 2, reading sector 8232
+RS03: tries left = 1, reading sector 8330
+RS03: tries left = 0, reading sector 8428
+RS03: max tries reached, stopping search
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -153,6 +225,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -232,6 +305,137 @@ Warning: image size set to 25000 for debugging!
 .. trying layer size 98
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 8232
+RS03: try number = 2, reading sector 8330
+RS03: try number = 3, reading sector 8428
+RS03: try number = 4, reading sector 8526
+RS03: try number = 5, reading sector 8624
+RS03: try number = 6, reading sector 8722
+RS03: try number = 7, reading sector 8820
+RS03: try number = 8, reading sector 8918
+RS03: try number = 9, reading sector 9016
+RS03: try number = 10, reading sector 9114
+RS03: try number = 11, reading sector 9212
+RS03: try number = 12, reading sector 9310
+RS03: try number = 13, reading sector 9408
+RS03: try number = 14, reading sector 9506
+RS03: try number = 15, reading sector 9604
+RS03: try number = 16, reading sector 9702
+RS03: try number = 17, reading sector 9800
+RS03: try number = 18, reading sector 9898
+RS03: try number = 19, reading sector 9996
+RS03: try number = 20, reading sector 10094
+RS03: try number = 21, reading sector 10192
+RS03: try number = 22, reading sector 10290
+RS03: try number = 23, reading sector 10388
+RS03: try number = 24, reading sector 10486
+RS03: try number = 25, reading sector 10584
+RS03: try number = 26, reading sector 10682
+RS03: try number = 27, reading sector 10780
+RS03: try number = 28, reading sector 10878
+RS03: try number = 29, reading sector 10976
+RS03: try number = 30, reading sector 11074
+RS03: try number = 31, reading sector 11172
+RS03: try number = 32, reading sector 11270
+RS03: try number = 33, reading sector 11368
+RS03: try number = 34, reading sector 11466
+RS03: try number = 35, reading sector 11564
+RS03: try number = 36, reading sector 11662
+RS03: try number = 37, reading sector 11760
+RS03: try number = 38, reading sector 11858
+RS03: try number = 39, reading sector 11956
+RS03: try number = 40, reading sector 12054
+RS03: try number = 41, reading sector 12152
+RS03: try number = 42, reading sector 12250
+RS03: try number = 43, reading sector 12348
+RS03: try number = 44, reading sector 12446
+RS03: try number = 45, reading sector 12544
+RS03: try number = 46, reading sector 12642
+RS03: try number = 47, reading sector 12740
+RS03: try number = 48, reading sector 12838
+RS03: try number = 49, reading sector 12936
+RS03: try number = 50, reading sector 13034
+RS03: try number = 51, reading sector 13132
+RS03: try number = 52, reading sector 13230
+RS03: try number = 53, reading sector 13328
+RS03: try number = 54, reading sector 13426
+RS03: try number = 55, reading sector 13524
+RS03: try number = 56, reading sector 13622
+RS03: try number = 57, reading sector 13720
+RS03: try number = 58, reading sector 13818
+RS03: try number = 59, reading sector 13916
+RS03: try number = 60, reading sector 14014
+RS03: try number = 61, reading sector 14112
+RS03: try number = 62, reading sector 14210
+RS03: try number = 63, reading sector 14308
+RS03: try number = 64, reading sector 14406
+RS03: try number = 65, reading sector 14504
+RS03: try number = 66, reading sector 14602
+RS03: try number = 67, reading sector 14700
+RS03: try number = 68, reading sector 14798
+RS03: try number = 69, reading sector 14896
+RS03: try number = 70, reading sector 14994
+RS03: try number = 71, reading sector 15092
+RS03: try number = 72, reading sector 15190
+RS03: try number = 73, reading sector 15288
+RS03: try number = 74, reading sector 15386
+RS03: try number = 75, reading sector 15484
+RS03: try number = 76, reading sector 15582
+RS03: try number = 77, reading sector 15680
+RS03: try number = 78, reading sector 15778
+RS03: try number = 79, reading sector 15876
+RS03: try number = 80, reading sector 15974
+RS03: try number = 81, reading sector 16072
+RS03: try number = 82, reading sector 16170
+RS03: try number = 83, reading sector 16268
+RS03: try number = 84, reading sector 16366
+RS03: try number = 85, reading sector 16464
+RS03: try number = 86, reading sector 16562
+RS03: try number = 87, reading sector 16660
+RS03: try number = 88, reading sector 16758
+RS03: try number = 89, reading sector 16856
+RS03: try number = 90, reading sector 16954
+RS03: try number = 91, reading sector 17052
+RS03: try number = 92, reading sector 17150
+RS03: try number = 93, reading sector 17248
+RS03: try number = 94, reading sector 17346
+RS03: try number = 95, reading sector 17444
+RS03: try number = 96, reading sector 17542
+RS03: try number = 97, reading sector 17640
+RS03: try number = 98, reading sector 17738
+RS03: try number = 99, reading sector 17836
+RS03: try number = 100, reading sector 17934
+RS03: try number = 101, reading sector 18032
+RS03: try number = 102, reading sector 18130
+RS03: try number = 103, reading sector 18228
+RS03: try number = 104, reading sector 18326
+RS03: try number = 105, reading sector 18424
+RS03: try number = 106, reading sector 18522
+RS03: try number = 107, reading sector 18620
+RS03: try number = 108, reading sector 18718
+RS03: try number = 109, reading sector 18816
+RS03: try number = 110, reading sector 18914
+RS03: try number = 111, reading sector 19012
+RS03: try number = 112, reading sector 19110
+RS03: try number = 113, reading sector 19208
+RS03: try number = 114, reading sector 19306
+RS03: try number = 115, reading sector 19404
+RS03: try number = 116, reading sector 19502
+RS03: try number = 117, reading sector 19600
+RS03: try number = 118, reading sector 19698
+RS03: try number = 119, reading sector 19796
+RS03: try number = 120, reading sector 19894
+RS03: try number = 121, reading sector 19992
+RS03: try number = 122, reading sector 20090
+RS03: try number = 123, reading sector 20188
+RS03: try number = 124, reading sector 20286
+RS03: try number = 125, reading sector 20384
+RS03: try number = 126, reading sector 20482
+RS03: try number = 127, reading sector 20580
+RS03: try number = 128, reading sector 20678
+RS03: try number = 129, reading sector 20776
+RS03: try number = 130, reading sector 20874
+RS03: try number = 131, reading sector 20972
 ** All layers tested -> no RS03 data found
 ...no augmented image detected.
 GetImageFingerprint(16): read & cached
--- a/regtest/database/RS03i_ecc_create_after_read
+++ b/regtest/database/RS03i_ecc_create_after_read
@@ -84,11 +84,83 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+Warning: image size set to 25000 for debugging!
+.. trying layer size 98
+Scanning layers for signatures.
+- layer slice 0
+RS03: tries left = 2, reading sector 8232
+RS03: tries left = 1, reading sector 8330
+RS03: tries left = 0, reading sector 8428
+RS03: max tries reached, stopping search
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -154,6 +226,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -233,6 +306,137 @@ Warning: image size set to 25000 for debugging!
 .. trying layer size 98
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 8232
+RS03: try number = 2, reading sector 8330
+RS03: try number = 3, reading sector 8428
+RS03: try number = 4, reading sector 8526
+RS03: try number = 5, reading sector 8624
+RS03: try number = 6, reading sector 8722
+RS03: try number = 7, reading sector 8820
+RS03: try number = 8, reading sector 8918
+RS03: try number = 9, reading sector 9016
+RS03: try number = 10, reading sector 9114
+RS03: try number = 11, reading sector 9212
+RS03: try number = 12, reading sector 9310
+RS03: try number = 13, reading sector 9408
+RS03: try number = 14, reading sector 9506
+RS03: try number = 15, reading sector 9604
+RS03: try number = 16, reading sector 9702
+RS03: try number = 17, reading sector 9800
+RS03: try number = 18, reading sector 9898
+RS03: try number = 19, reading sector 9996
+RS03: try number = 20, reading sector 10094
+RS03: try number = 21, reading sector 10192
+RS03: try number = 22, reading sector 10290
+RS03: try number = 23, reading sector 10388
+RS03: try number = 24, reading sector 10486
+RS03: try number = 25, reading sector 10584
+RS03: try number = 26, reading sector 10682
+RS03: try number = 27, reading sector 10780
+RS03: try number = 28, reading sector 10878
+RS03: try number = 29, reading sector 10976
+RS03: try number = 30, reading sector 11074
+RS03: try number = 31, reading sector 11172
+RS03: try number = 32, reading sector 11270
+RS03: try number = 33, reading sector 11368
+RS03: try number = 34, reading sector 11466
+RS03: try number = 35, reading sector 11564
+RS03: try number = 36, reading sector 11662
+RS03: try number = 37, reading sector 11760
+RS03: try number = 38, reading sector 11858
+RS03: try number = 39, reading sector 11956
+RS03: try number = 40, reading sector 12054
+RS03: try number = 41, reading sector 12152
+RS03: try number = 42, reading sector 12250
+RS03: try number = 43, reading sector 12348
+RS03: try number = 44, reading sector 12446
+RS03: try number = 45, reading sector 12544
+RS03: try number = 46, reading sector 12642
+RS03: try number = 47, reading sector 12740
+RS03: try number = 48, reading sector 12838
+RS03: try number = 49, reading sector 12936
+RS03: try number = 50, reading sector 13034
+RS03: try number = 51, reading sector 13132
+RS03: try number = 52, reading sector 13230
+RS03: try number = 53, reading sector 13328
+RS03: try number = 54, reading sector 13426
+RS03: try number = 55, reading sector 13524
+RS03: try number = 56, reading sector 13622
+RS03: try number = 57, reading sector 13720
+RS03: try number = 58, reading sector 13818
+RS03: try number = 59, reading sector 13916
+RS03: try number = 60, reading sector 14014
+RS03: try number = 61, reading sector 14112
+RS03: try number = 62, reading sector 14210
+RS03: try number = 63, reading sector 14308
+RS03: try number = 64, reading sector 14406
+RS03: try number = 65, reading sector 14504
+RS03: try number = 66, reading sector 14602
+RS03: try number = 67, reading sector 14700
+RS03: try number = 68, reading sector 14798
+RS03: try number = 69, reading sector 14896
+RS03: try number = 70, reading sector 14994
+RS03: try number = 71, reading sector 15092
+RS03: try number = 72, reading sector 15190
+RS03: try number = 73, reading sector 15288
+RS03: try number = 74, reading sector 15386
+RS03: try number = 75, reading sector 15484
+RS03: try number = 76, reading sector 15582
+RS03: try number = 77, reading sector 15680
+RS03: try number = 78, reading sector 15778
+RS03: try number = 79, reading sector 15876
+RS03: try number = 80, reading sector 15974
+RS03: try number = 81, reading sector 16072
+RS03: try number = 82, reading sector 16170
+RS03: try number = 83, reading sector 16268
+RS03: try number = 84, reading sector 16366
+RS03: try number = 85, reading sector 16464
+RS03: try number = 86, reading sector 16562
+RS03: try number = 87, reading sector 16660
+RS03: try number = 88, reading sector 16758
+RS03: try number = 89, reading sector 16856
+RS03: try number = 90, reading sector 16954
+RS03: try number = 91, reading sector 17052
+RS03: try number = 92, reading sector 17150
+RS03: try number = 93, reading sector 17248
+RS03: try number = 94, reading sector 17346
+RS03: try number = 95, reading sector 17444
+RS03: try number = 96, reading sector 17542
+RS03: try number = 97, reading sector 17640
+RS03: try number = 98, reading sector 17738
+RS03: try number = 99, reading sector 17836
+RS03: try number = 100, reading sector 17934
+RS03: try number = 101, reading sector 18032
+RS03: try number = 102, reading sector 18130
+RS03: try number = 103, reading sector 18228
+RS03: try number = 104, reading sector 18326
+RS03: try number = 105, reading sector 18424
+RS03: try number = 106, reading sector 18522
+RS03: try number = 107, reading sector 18620
+RS03: try number = 108, reading sector 18718
+RS03: try number = 109, reading sector 18816
+RS03: try number = 110, reading sector 18914
+RS03: try number = 111, reading sector 19012
+RS03: try number = 112, reading sector 19110
+RS03: try number = 113, reading sector 19208
+RS03: try number = 114, reading sector 19306
+RS03: try number = 115, reading sector 19404
+RS03: try number = 116, reading sector 19502
+RS03: try number = 117, reading sector 19600
+RS03: try number = 118, reading sector 19698
+RS03: try number = 119, reading sector 19796
+RS03: try number = 120, reading sector 19894
+RS03: try number = 121, reading sector 19992
+RS03: try number = 122, reading sector 20090
+RS03: try number = 123, reading sector 20188
+RS03: try number = 124, reading sector 20286
+RS03: try number = 125, reading sector 20384
+RS03: try number = 126, reading sector 20482
+RS03: try number = 127, reading sector 20580
+RS03: try number = 128, reading sector 20678
+RS03: try number = 129, reading sector 20776
+RS03: try number = 130, reading sector 20874
+RS03: try number = 131, reading sector 20972
 ** All layers tested -> no RS03 data found
 ...no augmented image detected.
 GetImageFingerprint(16): read & cached
--- a/regtest/database/RS03i_ecc_recreate_after_read_rs01
+++ b/regtest/database/RS03i_ecc_recreate_after_read_rs01
@@ -84,11 +84,83 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+Warning: image size set to 25000 for debugging!
+.. trying layer size 98
+Scanning layers for signatures.
+- layer slice 0
+RS03: tries left = 2, reading sector 8232
+RS03: tries left = 1, reading sector 8330
+RS03: tries left = 0, reading sector 8428
+RS03: max tries reached, stopping search
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -156,6 +228,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -235,6 +308,137 @@ Warning: image size set to 25000 for debugging!
 .. trying layer size 98
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 8232
+RS03: try number = 2, reading sector 8330
+RS03: try number = 3, reading sector 8428
+RS03: try number = 4, reading sector 8526
+RS03: try number = 5, reading sector 8624
+RS03: try number = 6, reading sector 8722
+RS03: try number = 7, reading sector 8820
+RS03: try number = 8, reading sector 8918
+RS03: try number = 9, reading sector 9016
+RS03: try number = 10, reading sector 9114
+RS03: try number = 11, reading sector 9212
+RS03: try number = 12, reading sector 9310
+RS03: try number = 13, reading sector 9408
+RS03: try number = 14, reading sector 9506
+RS03: try number = 15, reading sector 9604
+RS03: try number = 16, reading sector 9702
+RS03: try number = 17, reading sector 9800
+RS03: try number = 18, reading sector 9898
+RS03: try number = 19, reading sector 9996
+RS03: try number = 20, reading sector 10094
+RS03: try number = 21, reading sector 10192
+RS03: try number = 22, reading sector 10290
+RS03: try number = 23, reading sector 10388
+RS03: try number = 24, reading sector 10486
+RS03: try number = 25, reading sector 10584
+RS03: try number = 26, reading sector 10682
+RS03: try number = 27, reading sector 10780
+RS03: try number = 28, reading sector 10878
+RS03: try number = 29, reading sector 10976
+RS03: try number = 30, reading sector 11074
+RS03: try number = 31, reading sector 11172
+RS03: try number = 32, reading sector 11270
+RS03: try number = 33, reading sector 11368
+RS03: try number = 34, reading sector 11466
+RS03: try number = 35, reading sector 11564
+RS03: try number = 36, reading sector 11662
+RS03: try number = 37, reading sector 11760
+RS03: try number = 38, reading sector 11858
+RS03: try number = 39, reading sector 11956
+RS03: try number = 40, reading sector 12054
+RS03: try number = 41, reading sector 12152
+RS03: try number = 42, reading sector 12250
+RS03: try number = 43, reading sector 12348
+RS03: try number = 44, reading sector 12446
+RS03: try number = 45, reading sector 12544
+RS03: try number = 46, reading sector 12642
+RS03: try number = 47, reading sector 12740
+RS03: try number = 48, reading sector 12838
+RS03: try number = 49, reading sector 12936
+RS03: try number = 50, reading sector 13034
+RS03: try number = 51, reading sector 13132
+RS03: try number = 52, reading sector 13230
+RS03: try number = 53, reading sector 13328
+RS03: try number = 54, reading sector 13426
+RS03: try number = 55, reading sector 13524
+RS03: try number = 56, reading sector 13622
+RS03: try number = 57, reading sector 13720
+RS03: try number = 58, reading sector 13818
+RS03: try number = 59, reading sector 13916
+RS03: try number = 60, reading sector 14014
+RS03: try number = 61, reading sector 14112
+RS03: try number = 62, reading sector 14210
+RS03: try number = 63, reading sector 14308
+RS03: try number = 64, reading sector 14406
+RS03: try number = 65, reading sector 14504
+RS03: try number = 66, reading sector 14602
+RS03: try number = 67, reading sector 14700
+RS03: try number = 68, reading sector 14798
+RS03: try number = 69, reading sector 14896
+RS03: try number = 70, reading sector 14994
+RS03: try number = 71, reading sector 15092
+RS03: try number = 72, reading sector 15190
+RS03: try number = 73, reading sector 15288
+RS03: try number = 74, reading sector 15386
+RS03: try number = 75, reading sector 15484
+RS03: try number = 76, reading sector 15582
+RS03: try number = 77, reading sector 15680
+RS03: try number = 78, reading sector 15778
+RS03: try number = 79, reading sector 15876
+RS03: try number = 80, reading sector 15974
+RS03: try number = 81, reading sector 16072
+RS03: try number = 82, reading sector 16170
+RS03: try number = 83, reading sector 16268
+RS03: try number = 84, reading sector 16366
+RS03: try number = 85, reading sector 16464
+RS03: try number = 86, reading sector 16562
+RS03: try number = 87, reading sector 16660
+RS03: try number = 88, reading sector 16758
+RS03: try number = 89, reading sector 16856
+RS03: try number = 90, reading sector 16954
+RS03: try number = 91, reading sector 17052
+RS03: try number = 92, reading sector 17150
+RS03: try number = 93, reading sector 17248
+RS03: try number = 94, reading sector 17346
+RS03: try number = 95, reading sector 17444
+RS03: try number = 96, reading sector 17542
+RS03: try number = 97, reading sector 17640
+RS03: try number = 98, reading sector 17738
+RS03: try number = 99, reading sector 17836
+RS03: try number = 100, reading sector 17934
+RS03: try number = 101, reading sector 18032
+RS03: try number = 102, reading sector 18130
+RS03: try number = 103, reading sector 18228
+RS03: try number = 104, reading sector 18326
+RS03: try number = 105, reading sector 18424
+RS03: try number = 106, reading sector 18522
+RS03: try number = 107, reading sector 18620
+RS03: try number = 108, reading sector 18718
+RS03: try number = 109, reading sector 18816
+RS03: try number = 110, reading sector 18914
+RS03: try number = 111, reading sector 19012
+RS03: try number = 112, reading sector 19110
+RS03: try number = 113, reading sector 19208
+RS03: try number = 114, reading sector 19306
+RS03: try number = 115, reading sector 19404
+RS03: try number = 116, reading sector 19502
+RS03: try number = 117, reading sector 19600
+RS03: try number = 118, reading sector 19698
+RS03: try number = 119, reading sector 19796
+RS03: try number = 120, reading sector 19894
+RS03: try number = 121, reading sector 19992
+RS03: try number = 122, reading sector 20090
+RS03: try number = 123, reading sector 20188
+RS03: try number = 124, reading sector 20286
+RS03: try number = 125, reading sector 20384
+RS03: try number = 126, reading sector 20482
+RS03: try number = 127, reading sector 20580
+RS03: try number = 128, reading sector 20678
+RS03: try number = 129, reading sector 20776
+RS03: try number = 130, reading sector 20874
+RS03: try number = 131, reading sector 20972
 ** All layers tested -> no RS03 data found
 ...no augmented image detected.
 GetImageFingerprint(16): read & cached
--- a/regtest/database/RS03i_ecc_recreate_after_read_rs03f
+++ b/regtest/database/RS03i_ecc_recreate_after_read_rs03f
@@ -84,11 +84,83 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+Warning: image size set to 25000 for debugging!
+.. trying layer size 98
+Scanning layers for signatures.
+- layer slice 0
+RS03: tries left = 2, reading sector 8232
+RS03: tries left = 1, reading sector 8330
+RS03: tries left = 0, reading sector 8428
+RS03: max tries reached, stopping search
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -170,6 +242,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -249,6 +322,137 @@ Warning: image size set to 25000 for debugging!
 .. trying layer size 98
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 8232
+RS03: try number = 2, reading sector 8330
+RS03: try number = 3, reading sector 8428
+RS03: try number = 4, reading sector 8526
+RS03: try number = 5, reading sector 8624
+RS03: try number = 6, reading sector 8722
+RS03: try number = 7, reading sector 8820
+RS03: try number = 8, reading sector 8918
+RS03: try number = 9, reading sector 9016
+RS03: try number = 10, reading sector 9114
+RS03: try number = 11, reading sector 9212
+RS03: try number = 12, reading sector 9310
+RS03: try number = 13, reading sector 9408
+RS03: try number = 14, reading sector 9506
+RS03: try number = 15, reading sector 9604
+RS03: try number = 16, reading sector 9702
+RS03: try number = 17, reading sector 9800
+RS03: try number = 18, reading sector 9898
+RS03: try number = 19, reading sector 9996
+RS03: try number = 20, reading sector 10094
+RS03: try number = 21, reading sector 10192
+RS03: try number = 22, reading sector 10290
+RS03: try number = 23, reading sector 10388
+RS03: try number = 24, reading sector 10486
+RS03: try number = 25, reading sector 10584
+RS03: try number = 26, reading sector 10682
+RS03: try number = 27, reading sector 10780
+RS03: try number = 28, reading sector 10878
+RS03: try number = 29, reading sector 10976
+RS03: try number = 30, reading sector 11074
+RS03: try number = 31, reading sector 11172
+RS03: try number = 32, reading sector 11270
+RS03: try number = 33, reading sector 11368
+RS03: try number = 34, reading sector 11466
+RS03: try number = 35, reading sector 11564
+RS03: try number = 36, reading sector 11662
+RS03: try number = 37, reading sector 11760
+RS03: try number = 38, reading sector 11858
+RS03: try number = 39, reading sector 11956
+RS03: try number = 40, reading sector 12054
+RS03: try number = 41, reading sector 12152
+RS03: try number = 42, reading sector 12250
+RS03: try number = 43, reading sector 12348
+RS03: try number = 44, reading sector 12446
+RS03: try number = 45, reading sector 12544
+RS03: try number = 46, reading sector 12642
+RS03: try number = 47, reading sector 12740
+RS03: try number = 48, reading sector 12838
+RS03: try number = 49, reading sector 12936
+RS03: try number = 50, reading sector 13034
+RS03: try number = 51, reading sector 13132
+RS03: try number = 52, reading sector 13230
+RS03: try number = 53, reading sector 13328
+RS03: try number = 54, reading sector 13426
+RS03: try number = 55, reading sector 13524
+RS03: try number = 56, reading sector 13622
+RS03: try number = 57, reading sector 13720
+RS03: try number = 58, reading sector 13818
+RS03: try number = 59, reading sector 13916
+RS03: try number = 60, reading sector 14014
+RS03: try number = 61, reading sector 14112
+RS03: try number = 62, reading sector 14210
+RS03: try number = 63, reading sector 14308
+RS03: try number = 64, reading sector 14406
+RS03: try number = 65, reading sector 14504
+RS03: try number = 66, reading sector 14602
+RS03: try number = 67, reading sector 14700
+RS03: try number = 68, reading sector 14798
+RS03: try number = 69, reading sector 14896
+RS03: try number = 70, reading sector 14994
+RS03: try number = 71, reading sector 15092
+RS03: try number = 72, reading sector 15190
+RS03: try number = 73, reading sector 15288
+RS03: try number = 74, reading sector 15386
+RS03: try number = 75, reading sector 15484
+RS03: try number = 76, reading sector 15582
+RS03: try number = 77, reading sector 15680
+RS03: try number = 78, reading sector 15778
+RS03: try number = 79, reading sector 15876
+RS03: try number = 80, reading sector 15974
+RS03: try number = 81, reading sector 16072
+RS03: try number = 82, reading sector 16170
+RS03: try number = 83, reading sector 16268
+RS03: try number = 84, reading sector 16366
+RS03: try number = 85, reading sector 16464
+RS03: try number = 86, reading sector 16562
+RS03: try number = 87, reading sector 16660
+RS03: try number = 88, reading sector 16758
+RS03: try number = 89, reading sector 16856
+RS03: try number = 90, reading sector 16954
+RS03: try number = 91, reading sector 17052
+RS03: try number = 92, reading sector 17150
+RS03: try number = 93, reading sector 17248
+RS03: try number = 94, reading sector 17346
+RS03: try number = 95, reading sector 17444
+RS03: try number = 96, reading sector 17542
+RS03: try number = 97, reading sector 17640
+RS03: try number = 98, reading sector 17738
+RS03: try number = 99, reading sector 17836
+RS03: try number = 100, reading sector 17934
+RS03: try number = 101, reading sector 18032
+RS03: try number = 102, reading sector 18130
+RS03: try number = 103, reading sector 18228
+RS03: try number = 104, reading sector 18326
+RS03: try number = 105, reading sector 18424
+RS03: try number = 106, reading sector 18522
+RS03: try number = 107, reading sector 18620
+RS03: try number = 108, reading sector 18718
+RS03: try number = 109, reading sector 18816
+RS03: try number = 110, reading sector 18914
+RS03: try number = 111, reading sector 19012
+RS03: try number = 112, reading sector 19110
+RS03: try number = 113, reading sector 19208
+RS03: try number = 114, reading sector 19306
+RS03: try number = 115, reading sector 19404
+RS03: try number = 116, reading sector 19502
+RS03: try number = 117, reading sector 19600
+RS03: try number = 118, reading sector 19698
+RS03: try number = 119, reading sector 19796
+RS03: try number = 120, reading sector 19894
+RS03: try number = 121, reading sector 19992
+RS03: try number = 122, reading sector 20090
+RS03: try number = 123, reading sector 20188
+RS03: try number = 124, reading sector 20286
+RS03: try number = 125, reading sector 20384
+RS03: try number = 126, reading sector 20482
+RS03: try number = 127, reading sector 20580
+RS03: try number = 128, reading sector 20678
+RS03: try number = 129, reading sector 20776
+RS03: try number = 130, reading sector 20874
+RS03: try number = 131, reading sector 20972
 ** All layers tested -> no RS03 data found
 ...no augmented image detected.
 GetImageFingerprint(16): read & cached
--- a/regtest/database/RS03i_ecc_recreate_after_read_rs03i
+++ b/regtest/database/RS03i_ecc_recreate_after_read_rs03i
@@ -84,7 +84,67 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+try_sector: trying sector 22528
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
@@ -166,6 +226,7 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/regtest/database/RS03i_fix_with_ecc_file_crc_block
+++ b/regtest/database/RS03i_fix_with_ecc_file_crc_block
@@ -51,6 +51,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -131,9 +132,174 @@ Warning: image size set to 25000 for debugging!
 .. trying layer size 98
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 8232
+RS03: try number = 2, reading sector 8330
+RS03: try number = 3, reading sector 8428
+RS03: try number = 4, reading sector 8526
+RS03: try number = 5, reading sector 8624
+RS03: try number = 6, reading sector 8722
+RS03: try number = 7, reading sector 8820
+RS03: try number = 8, reading sector 8918
+RS03: try number = 9, reading sector 9016
+RS03: try number = 10, reading sector 9114
+RS03: try number = 11, reading sector 9212
+RS03: try number = 12, reading sector 9310
+RS03: try number = 13, reading sector 9408
+RS03: try number = 14, reading sector 9506
+RS03: try number = 15, reading sector 9604
+RS03: try number = 16, reading sector 9702
+RS03: try number = 17, reading sector 9800
+RS03: try number = 18, reading sector 9898
+RS03: try number = 19, reading sector 9996
+RS03: try number = 20, reading sector 10094
+RS03: try number = 21, reading sector 10192
+RS03: try number = 22, reading sector 10290
+RS03: try number = 23, reading sector 10388
+RS03: try number = 24, reading sector 10486
+RS03: try number = 25, reading sector 10584
+RS03: try number = 26, reading sector 10682
+RS03: try number = 27, reading sector 10780
+RS03: try number = 28, reading sector 10878
+RS03: try number = 29, reading sector 10976
+RS03: try number = 30, reading sector 11074
+RS03: try number = 31, reading sector 11172
+RS03: try number = 32, reading sector 11270
+RS03: try number = 33, reading sector 11368
+RS03: try number = 34, reading sector 11466
+RS03: try number = 35, reading sector 11564
+RS03: try number = 36, reading sector 11662
+RS03: try number = 37, reading sector 11760
+RS03: try number = 38, reading sector 11858
+RS03: try number = 39, reading sector 11956
+RS03: try number = 40, reading sector 12054
+RS03: try number = 41, reading sector 12152
+RS03: try number = 42, reading sector 12250
+RS03: try number = 43, reading sector 12348
+RS03: try number = 44, reading sector 12446
+RS03: try number = 45, reading sector 12544
+RS03: try number = 46, reading sector 12642
+RS03: try number = 47, reading sector 12740
+RS03: try number = 48, reading sector 12838
+RS03: try number = 49, reading sector 12936
+RS03: try number = 50, reading sector 13034
+RS03: try number = 51, reading sector 13132
+RS03: try number = 52, reading sector 13230
+RS03: try number = 53, reading sector 13328
+RS03: try number = 54, reading sector 13426
+RS03: try number = 55, reading sector 13524
+RS03: try number = 56, reading sector 13622
+RS03: try number = 57, reading sector 13720
+RS03: try number = 58, reading sector 13818
+RS03: try number = 59, reading sector 13916
+RS03: try number = 60, reading sector 14014
+RS03: try number = 61, reading sector 14112
+RS03: try number = 62, reading sector 14210
+RS03: try number = 63, reading sector 14308
+RS03: try number = 64, reading sector 14406
+RS03: try number = 65, reading sector 14504
+RS03: try number = 66, reading sector 14602
+RS03: try number = 67, reading sector 14700
+RS03: try number = 68, reading sector 14798
+RS03: try number = 69, reading sector 14896
+RS03: try number = 70, reading sector 14994
+RS03: try number = 71, reading sector 15092
+RS03: try number = 72, reading sector 15190
+RS03: try number = 73, reading sector 15288
+RS03: try number = 74, reading sector 15386
+RS03: try number = 75, reading sector 15484
+RS03: try number = 76, reading sector 15582
+RS03: try number = 77, reading sector 15680
+RS03: try number = 78, reading sector 15778
+RS03: try number = 79, reading sector 15876
+RS03: try number = 80, reading sector 15974
+RS03: try number = 81, reading sector 16072
+RS03: try number = 82, reading sector 16170
+RS03: try number = 83, reading sector 16268
+RS03: try number = 84, reading sector 16366
+RS03: try number = 85, reading sector 16464
+RS03: try number = 86, reading sector 16562
+RS03: try number = 87, reading sector 16660
+RS03: try number = 88, reading sector 16758
+RS03: try number = 89, reading sector 16856
+RS03: try number = 90, reading sector 16954
+RS03: try number = 91, reading sector 17052
+RS03: try number = 92, reading sector 17150
+RS03: try number = 93, reading sector 17248
+RS03: try number = 94, reading sector 17346
+RS03: try number = 95, reading sector 17444
+RS03: try number = 96, reading sector 17542
+RS03: try number = 97, reading sector 17640
+RS03: try number = 98, reading sector 17738
+RS03: try number = 99, reading sector 17836
+RS03: try number = 100, reading sector 17934
+RS03: try number = 101, reading sector 18032
+RS03: try number = 102, reading sector 18130
+RS03: try number = 103, reading sector 18228
+RS03: try number = 104, reading sector 18326
+RS03: try number = 105, reading sector 18424
+RS03: try number = 106, reading sector 18522
+RS03: try number = 107, reading sector 18620
+RS03: try number = 108, reading sector 18718
+RS03: try number = 109, reading sector 18816
+RS03: try number = 110, reading sector 18914
+RS03: try number = 111, reading sector 19012
+RS03: try number = 112, reading sector 19110
+RS03: try number = 113, reading sector 19208
+RS03: try number = 114, reading sector 19306
+RS03: try number = 115, reading sector 19404
+RS03: try number = 116, reading sector 19502
+RS03: try number = 117, reading sector 19600
+RS03: try number = 118, reading sector 19698
+RS03: try number = 119, reading sector 19796
+RS03: try number = 120, reading sector 19894
+RS03: try number = 121, reading sector 19992
+RS03: try number = 122, reading sector 20090
+RS03: try number = 123, reading sector 20188
+RS03: try number = 124, reading sector 20286
+RS03: try number = 125, reading sector 20384
+RS03: try number = 126, reading sector 20482
+RS03: try number = 127, reading sector 20580
+RS03: try number = 128, reading sector 20678
+RS03: try number = 129, reading sector 20776
+RS03: try number = 130, reading sector 20874
+RS03: try number = 131, reading sector 20972
+RS03: try number = 132, reading sector 21070
 .. Crc block from ecc file in image - IGNORED
+RS03: try number = 133, reading sector 21168
+RS03: try number = 134, reading sector 21266
+RS03: try number = 135, reading sector 21364
+RS03: try number = 136, reading sector 21462
+RS03: try number = 137, reading sector 21560
+RS03: try number = 138, reading sector 21658
+RS03: try number = 139, reading sector 21756
+RS03: try number = 140, reading sector 21854
+RS03: try number = 141, reading sector 21952
+RS03: try number = 142, reading sector 22050
+RS03: try number = 143, reading sector 22148
+RS03: try number = 144, reading sector 22246
+RS03: try number = 145, reading sector 22344
+RS03: try number = 146, reading sector 22442
+RS03: try number = 147, reading sector 22540
+RS03: try number = 148, reading sector 22638
+RS03: try number = 149, reading sector 22736
+RS03: try number = 150, reading sector 22834
+RS03: try number = 151, reading sector 22932
+RS03: try number = 152, reading sector 23030
+RS03: try number = 153, reading sector 23128
+RS03: try number = 154, reading sector 23226
+RS03: try number = 155, reading sector 23324
+RS03: try number = 156, reading sector 23422
+RS03: try number = 157, reading sector 23520
+RS03: try number = 158, reading sector 23618
+RS03: try number = 159, reading sector 23716
+RS03: try number = 160, reading sector 23814
+RS03: try number = 161, reading sector 23912
+RS03: try number = 162, reading sector 24010
+RS03: try number = 163, reading sector 24108
+RS03: try number = 164, reading sector 24206
 -> 1 untested layers remaining
 - layer slice 1
+RS03: try number = 165, reading sector 21071
 ** Success: sector 21071, rediscovered format with 39 roots
 ...augmented image found
 GetImageFingerprint(16): read & cached
--- a/regtest/database/RS03i_fix_with_ecc_file_header
+++ b/regtest/database/RS03i_fix_with_ecc_file_header
@@ -51,6 +51,7 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -132,6 +133,138 @@ Warning: image size set to 25000 for debugging!
 .. trying layer size 98
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 8232
+RS03: try number = 2, reading sector 8330
+RS03: try number = 3, reading sector 8428
+RS03: try number = 4, reading sector 8526
+RS03: try number = 5, reading sector 8624
+RS03: try number = 6, reading sector 8722
+RS03: try number = 7, reading sector 8820
+RS03: try number = 8, reading sector 8918
+RS03: try number = 9, reading sector 9016
+RS03: try number = 10, reading sector 9114
+RS03: try number = 11, reading sector 9212
+RS03: try number = 12, reading sector 9310
+RS03: try number = 13, reading sector 9408
+RS03: try number = 14, reading sector 9506
+RS03: try number = 15, reading sector 9604
+RS03: try number = 16, reading sector 9702
+RS03: try number = 17, reading sector 9800
+RS03: try number = 18, reading sector 9898
+RS03: try number = 19, reading sector 9996
+RS03: try number = 20, reading sector 10094
+RS03: try number = 21, reading sector 10192
+RS03: try number = 22, reading sector 10290
+RS03: try number = 23, reading sector 10388
+RS03: try number = 24, reading sector 10486
+RS03: try number = 25, reading sector 10584
+RS03: try number = 26, reading sector 10682
+RS03: try number = 27, reading sector 10780
+RS03: try number = 28, reading sector 10878
+RS03: try number = 29, reading sector 10976
+RS03: try number = 30, reading sector 11074
+RS03: try number = 31, reading sector 11172
+RS03: try number = 32, reading sector 11270
+RS03: try number = 33, reading sector 11368
+RS03: try number = 34, reading sector 11466
+RS03: try number = 35, reading sector 11564
+RS03: try number = 36, reading sector 11662
+RS03: try number = 37, reading sector 11760
+RS03: try number = 38, reading sector 11858
+RS03: try number = 39, reading sector 11956
+RS03: try number = 40, reading sector 12054
+RS03: try number = 41, reading sector 12152
+RS03: try number = 42, reading sector 12250
+RS03: try number = 43, reading sector 12348
+RS03: try number = 44, reading sector 12446
+RS03: try number = 45, reading sector 12544
+RS03: try number = 46, reading sector 12642
+RS03: try number = 47, reading sector 12740
+RS03: try number = 48, reading sector 12838
+RS03: try number = 49, reading sector 12936
+RS03: try number = 50, reading sector 13034
+RS03: try number = 51, reading sector 13132
+RS03: try number = 52, reading sector 13230
+RS03: try number = 53, reading sector 13328
+RS03: try number = 54, reading sector 13426
+RS03: try number = 55, reading sector 13524
+RS03: try number = 56, reading sector 13622
+RS03: try number = 57, reading sector 13720
+RS03: try number = 58, reading sector 13818
+RS03: try number = 59, reading sector 13916
+RS03: try number = 60, reading sector 14014
+RS03: try number = 61, reading sector 14112
+RS03: try number = 62, reading sector 14210
+RS03: try number = 63, reading sector 14308
+RS03: try number = 64, reading sector 14406
+RS03: try number = 65, reading sector 14504
+RS03: try number = 66, reading sector 14602
+RS03: try number = 67, reading sector 14700
+RS03: try number = 68, reading sector 14798
+RS03: try number = 69, reading sector 14896
+RS03: try number = 70, reading sector 14994
+RS03: try number = 71, reading sector 15092
+RS03: try number = 72, reading sector 15190
+RS03: try number = 73, reading sector 15288
+RS03: try number = 74, reading sector 15386
+RS03: try number = 75, reading sector 15484
+RS03: try number = 76, reading sector 15582
+RS03: try number = 77, reading sector 15680
+RS03: try number = 78, reading sector 15778
+RS03: try number = 79, reading sector 15876
+RS03: try number = 80, reading sector 15974
+RS03: try number = 81, reading sector 16072
+RS03: try number = 82, reading sector 16170
+RS03: try number = 83, reading sector 16268
+RS03: try number = 84, reading sector 16366
+RS03: try number = 85, reading sector 16464
+RS03: try number = 86, reading sector 16562
+RS03: try number = 87, reading sector 16660
+RS03: try number = 88, reading sector 16758
+RS03: try number = 89, reading sector 16856
+RS03: try number = 90, reading sector 16954
+RS03: try number = 91, reading sector 17052
+RS03: try number = 92, reading sector 17150
+RS03: try number = 93, reading sector 17248
+RS03: try number = 94, reading sector 17346
+RS03: try number = 95, reading sector 17444
+RS03: try number = 96, reading sector 17542
+RS03: try number = 97, reading sector 17640
+RS03: try number = 98, reading sector 17738
+RS03: try number = 99, reading sector 17836
+RS03: try number = 100, reading sector 17934
+RS03: try number = 101, reading sector 18032
+RS03: try number = 102, reading sector 18130
+RS03: try number = 103, reading sector 18228
+RS03: try number = 104, reading sector 18326
+RS03: try number = 105, reading sector 18424
+RS03: try number = 106, reading sector 18522
+RS03: try number = 107, reading sector 18620
+RS03: try number = 108, reading sector 18718
+RS03: try number = 109, reading sector 18816
+RS03: try number = 110, reading sector 18914
+RS03: try number = 111, reading sector 19012
+RS03: try number = 112, reading sector 19110
+RS03: try number = 113, reading sector 19208
+RS03: try number = 114, reading sector 19306
+RS03: try number = 115, reading sector 19404
+RS03: try number = 116, reading sector 19502
+RS03: try number = 117, reading sector 19600
+RS03: try number = 118, reading sector 19698
+RS03: try number = 119, reading sector 19796
+RS03: try number = 120, reading sector 19894
+RS03: try number = 121, reading sector 19992
+RS03: try number = 122, reading sector 20090
+RS03: try number = 123, reading sector 20188
+RS03: try number = 124, reading sector 20286
+RS03: try number = 125, reading sector 20384
+RS03: try number = 126, reading sector 20482
+RS03: try number = 127, reading sector 20580
+RS03: try number = 128, reading sector 20678
+RS03: try number = 129, reading sector 20776
+RS03: try number = 130, reading sector 20874
+RS03: try number = 131, reading sector 20972
+RS03: try number = 132, reading sector 21070
 ** Success: sector 21070, rediscovered format with 39 roots
 ...augmented image found
 GetImageFingerprint(16): read & cached
--- a/regtest/database/RS03i_fix_with_missing_header
+++ b/regtest/database/RS03i_fix_with_missing_header
@@ -51,6 +51,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -131,6 +132,138 @@ Warning: image size set to 25000 for debugging!
 .. trying layer size 98
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 8232
+RS03: try number = 2, reading sector 8330
+RS03: try number = 3, reading sector 8428
+RS03: try number = 4, reading sector 8526
+RS03: try number = 5, reading sector 8624
+RS03: try number = 6, reading sector 8722
+RS03: try number = 7, reading sector 8820
+RS03: try number = 8, reading sector 8918
+RS03: try number = 9, reading sector 9016
+RS03: try number = 10, reading sector 9114
+RS03: try number = 11, reading sector 9212
+RS03: try number = 12, reading sector 9310
+RS03: try number = 13, reading sector 9408
+RS03: try number = 14, reading sector 9506
+RS03: try number = 15, reading sector 9604
+RS03: try number = 16, reading sector 9702
+RS03: try number = 17, reading sector 9800
+RS03: try number = 18, reading sector 9898
+RS03: try number = 19, reading sector 9996
+RS03: try number = 20, reading sector 10094
+RS03: try number = 21, reading sector 10192
+RS03: try number = 22, reading sector 10290
+RS03: try number = 23, reading sector 10388
+RS03: try number = 24, reading sector 10486
+RS03: try number = 25, reading sector 10584
+RS03: try number = 26, reading sector 10682
+RS03: try number = 27, reading sector 10780
+RS03: try number = 28, reading sector 10878
+RS03: try number = 29, reading sector 10976
+RS03: try number = 30, reading sector 11074
+RS03: try number = 31, reading sector 11172
+RS03: try number = 32, reading sector 11270
+RS03: try number = 33, reading sector 11368
+RS03: try number = 34, reading sector 11466
+RS03: try number = 35, reading sector 11564
+RS03: try number = 36, reading sector 11662
+RS03: try number = 37, reading sector 11760
+RS03: try number = 38, reading sector 11858
+RS03: try number = 39, reading sector 11956
+RS03: try number = 40, reading sector 12054
+RS03: try number = 41, reading sector 12152
+RS03: try number = 42, reading sector 12250
+RS03: try number = 43, reading sector 12348
+RS03: try number = 44, reading sector 12446
+RS03: try number = 45, reading sector 12544
+RS03: try number = 46, reading sector 12642
+RS03: try number = 47, reading sector 12740
+RS03: try number = 48, reading sector 12838
+RS03: try number = 49, reading sector 12936
+RS03: try number = 50, reading sector 13034
+RS03: try number = 51, reading sector 13132
+RS03: try number = 52, reading sector 13230
+RS03: try number = 53, reading sector 13328
+RS03: try number = 54, reading sector 13426
+RS03: try number = 55, reading sector 13524
+RS03: try number = 56, reading sector 13622
+RS03: try number = 57, reading sector 13720
+RS03: try number = 58, reading sector 13818
+RS03: try number = 59, reading sector 13916
+RS03: try number = 60, reading sector 14014
+RS03: try number = 61, reading sector 14112
+RS03: try number = 62, reading sector 14210
+RS03: try number = 63, reading sector 14308
+RS03: try number = 64, reading sector 14406
+RS03: try number = 65, reading sector 14504
+RS03: try number = 66, reading sector 14602
+RS03: try number = 67, reading sector 14700
+RS03: try number = 68, reading sector 14798
+RS03: try number = 69, reading sector 14896
+RS03: try number = 70, reading sector 14994
+RS03: try number = 71, reading sector 15092
+RS03: try number = 72, reading sector 15190
+RS03: try number = 73, reading sector 15288
+RS03: try number = 74, reading sector 15386
+RS03: try number = 75, reading sector 15484
+RS03: try number = 76, reading sector 15582
+RS03: try number = 77, reading sector 15680
+RS03: try number = 78, reading sector 15778
+RS03: try number = 79, reading sector 15876
+RS03: try number = 80, reading sector 15974
+RS03: try number = 81, reading sector 16072
+RS03: try number = 82, reading sector 16170
+RS03: try number = 83, reading sector 16268
+RS03: try number = 84, reading sector 16366
+RS03: try number = 85, reading sector 16464
+RS03: try number = 86, reading sector 16562
+RS03: try number = 87, reading sector 16660
+RS03: try number = 88, reading sector 16758
+RS03: try number = 89, reading sector 16856
+RS03: try number = 90, reading sector 16954
+RS03: try number = 91, reading sector 17052
+RS03: try number = 92, reading sector 17150
+RS03: try number = 93, reading sector 17248
+RS03: try number = 94, reading sector 17346
+RS03: try number = 95, reading sector 17444
+RS03: try number = 96, reading sector 17542
+RS03: try number = 97, reading sector 17640
+RS03: try number = 98, reading sector 17738
+RS03: try number = 99, reading sector 17836
+RS03: try number = 100, reading sector 17934
+RS03: try number = 101, reading sector 18032
+RS03: try number = 102, reading sector 18130
+RS03: try number = 103, reading sector 18228
+RS03: try number = 104, reading sector 18326
+RS03: try number = 105, reading sector 18424
+RS03: try number = 106, reading sector 18522
+RS03: try number = 107, reading sector 18620
+RS03: try number = 108, reading sector 18718
+RS03: try number = 109, reading sector 18816
+RS03: try number = 110, reading sector 18914
+RS03: try number = 111, reading sector 19012
+RS03: try number = 112, reading sector 19110
+RS03: try number = 113, reading sector 19208
+RS03: try number = 114, reading sector 19306
+RS03: try number = 115, reading sector 19404
+RS03: try number = 116, reading sector 19502
+RS03: try number = 117, reading sector 19600
+RS03: try number = 118, reading sector 19698
+RS03: try number = 119, reading sector 19796
+RS03: try number = 120, reading sector 19894
+RS03: try number = 121, reading sector 19992
+RS03: try number = 122, reading sector 20090
+RS03: try number = 123, reading sector 20188
+RS03: try number = 124, reading sector 20286
+RS03: try number = 125, reading sector 20384
+RS03: try number = 126, reading sector 20482
+RS03: try number = 127, reading sector 20580
+RS03: try number = 128, reading sector 20678
+RS03: try number = 129, reading sector 20776
+RS03: try number = 130, reading sector 20874
+RS03: try number = 131, reading sector 20972
+RS03: try number = 132, reading sector 21070
 ** Success: sector 21070, rediscovered format with 39 roots
 ...augmented image found
 GetImageFingerprint(16): read & cached
--- a/regtest/database/RS03i_fix_with_missing_iso_header
+++ b/regtest/database/RS03i_fix_with_missing_iso_header
@@ -27,6 +27,7 @@ ExamineECC() started
 ...trying RS01
 ...trying RS02
 RS02Recognize: file rs03i-tmp.iso
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -108,6 +109,138 @@ Warning: image size set to 25000 for debugging!
 .. trying layer size 98
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 8232
+RS03: try number = 2, reading sector 8330
+RS03: try number = 3, reading sector 8428
+RS03: try number = 4, reading sector 8526
+RS03: try number = 5, reading sector 8624
+RS03: try number = 6, reading sector 8722
+RS03: try number = 7, reading sector 8820
+RS03: try number = 8, reading sector 8918
+RS03: try number = 9, reading sector 9016
+RS03: try number = 10, reading sector 9114
+RS03: try number = 11, reading sector 9212
+RS03: try number = 12, reading sector 9310
+RS03: try number = 13, reading sector 9408
+RS03: try number = 14, reading sector 9506
+RS03: try number = 15, reading sector 9604
+RS03: try number = 16, reading sector 9702
+RS03: try number = 17, reading sector 9800
+RS03: try number = 18, reading sector 9898
+RS03: try number = 19, reading sector 9996
+RS03: try number = 20, reading sector 10094
+RS03: try number = 21, reading sector 10192
+RS03: try number = 22, reading sector 10290
+RS03: try number = 23, reading sector 10388
+RS03: try number = 24, reading sector 10486
+RS03: try number = 25, reading sector 10584
+RS03: try number = 26, reading sector 10682
+RS03: try number = 27, reading sector 10780
+RS03: try number = 28, reading sector 10878
+RS03: try number = 29, reading sector 10976
+RS03: try number = 30, reading sector 11074
+RS03: try number = 31, reading sector 11172
+RS03: try number = 32, reading sector 11270
+RS03: try number = 33, reading sector 11368
+RS03: try number = 34, reading sector 11466
+RS03: try number = 35, reading sector 11564
+RS03: try number = 36, reading sector 11662
+RS03: try number = 37, reading sector 11760
+RS03: try number = 38, reading sector 11858
+RS03: try number = 39, reading sector 11956
+RS03: try number = 40, reading sector 12054
+RS03: try number = 41, reading sector 12152
+RS03: try number = 42, reading sector 12250
+RS03: try number = 43, reading sector 12348
+RS03: try number = 44, reading sector 12446
+RS03: try number = 45, reading sector 12544
+RS03: try number = 46, reading sector 12642
+RS03: try number = 47, reading sector 12740
+RS03: try number = 48, reading sector 12838
+RS03: try number = 49, reading sector 12936
+RS03: try number = 50, reading sector 13034
+RS03: try number = 51, reading sector 13132
+RS03: try number = 52, reading sector 13230
+RS03: try number = 53, reading sector 13328
+RS03: try number = 54, reading sector 13426
+RS03: try number = 55, reading sector 13524
+RS03: try number = 56, reading sector 13622
+RS03: try number = 57, reading sector 13720
+RS03: try number = 58, reading sector 13818
+RS03: try number = 59, reading sector 13916
+RS03: try number = 60, reading sector 14014
+RS03: try number = 61, reading sector 14112
+RS03: try number = 62, reading sector 14210
+RS03: try number = 63, reading sector 14308
+RS03: try number = 64, reading sector 14406
+RS03: try number = 65, reading sector 14504
+RS03: try number = 66, reading sector 14602
+RS03: try number = 67, reading sector 14700
+RS03: try number = 68, reading sector 14798
+RS03: try number = 69, reading sector 14896
+RS03: try number = 70, reading sector 14994
+RS03: try number = 71, reading sector 15092
+RS03: try number = 72, reading sector 15190
+RS03: try number = 73, reading sector 15288
+RS03: try number = 74, reading sector 15386
+RS03: try number = 75, reading sector 15484
+RS03: try number = 76, reading sector 15582
+RS03: try number = 77, reading sector 15680
+RS03: try number = 78, reading sector 15778
+RS03: try number = 79, reading sector 15876
+RS03: try number = 80, reading sector 15974
+RS03: try number = 81, reading sector 16072
+RS03: try number = 82, reading sector 16170
+RS03: try number = 83, reading sector 16268
+RS03: try number = 84, reading sector 16366
+RS03: try number = 85, reading sector 16464
+RS03: try number = 86, reading sector 16562
+RS03: try number = 87, reading sector 16660
+RS03: try number = 88, reading sector 16758
+RS03: try number = 89, reading sector 16856
+RS03: try number = 90, reading sector 16954
+RS03: try number = 91, reading sector 17052
+RS03: try number = 92, reading sector 17150
+RS03: try number = 93, reading sector 17248
+RS03: try number = 94, reading sector 17346
+RS03: try number = 95, reading sector 17444
+RS03: try number = 96, reading sector 17542
+RS03: try number = 97, reading sector 17640
+RS03: try number = 98, reading sector 17738
+RS03: try number = 99, reading sector 17836
+RS03: try number = 100, reading sector 17934
+RS03: try number = 101, reading sector 18032
+RS03: try number = 102, reading sector 18130
+RS03: try number = 103, reading sector 18228
+RS03: try number = 104, reading sector 18326
+RS03: try number = 105, reading sector 18424
+RS03: try number = 106, reading sector 18522
+RS03: try number = 107, reading sector 18620
+RS03: try number = 108, reading sector 18718
+RS03: try number = 109, reading sector 18816
+RS03: try number = 110, reading sector 18914
+RS03: try number = 111, reading sector 19012
+RS03: try number = 112, reading sector 19110
+RS03: try number = 113, reading sector 19208
+RS03: try number = 114, reading sector 19306
+RS03: try number = 115, reading sector 19404
+RS03: try number = 116, reading sector 19502
+RS03: try number = 117, reading sector 19600
+RS03: try number = 118, reading sector 19698
+RS03: try number = 119, reading sector 19796
+RS03: try number = 120, reading sector 19894
+RS03: try number = 121, reading sector 19992
+RS03: try number = 122, reading sector 20090
+RS03: try number = 123, reading sector 20188
+RS03: try number = 124, reading sector 20286
+RS03: try number = 125, reading sector 20384
+RS03: try number = 126, reading sector 20482
+RS03: try number = 127, reading sector 20580
+RS03: try number = 128, reading sector 20678
+RS03: try number = 129, reading sector 20776
+RS03: try number = 130, reading sector 20874
+RS03: try number = 131, reading sector 20972
+RS03: try number = 132, reading sector 21070
 ** Success: sector 21070, rediscovered format with 39 roots
 ...augmented image found
 GetImageFingerprint(16): not readable
--- a/regtest/database/RS03i_missing_header
+++ b/regtest/database/RS03i_missing_header
@@ -50,6 +50,7 @@ try_sector: trying sector 235219
 try_sector: read error, trying next header
 try_sector: trying sector 235069
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -139,6 +140,90 @@ RS03RecognizeImage: No EH, entering exhaustive search
 .. trying layer size 1409
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 118356
+RS03: try number = 2, reading sector 119765
+RS03: try number = 3, reading sector 121174
+RS03: try number = 4, reading sector 122583
+RS03: try number = 5, reading sector 123992
+RS03: try number = 6, reading sector 125401
+RS03: try number = 7, reading sector 126810
+RS03: try number = 8, reading sector 128219
+RS03: try number = 9, reading sector 129628
+RS03: try number = 10, reading sector 131037
+RS03: try number = 11, reading sector 132446
+RS03: try number = 12, reading sector 133855
+RS03: try number = 13, reading sector 135264
+RS03: try number = 14, reading sector 136673
+RS03: try number = 15, reading sector 138082
+RS03: try number = 16, reading sector 139491
+RS03: try number = 17, reading sector 140900
+RS03: try number = 18, reading sector 142309
+RS03: try number = 19, reading sector 143718
+RS03: try number = 20, reading sector 145127
+RS03: try number = 21, reading sector 146536
+RS03: try number = 22, reading sector 147945
+RS03: try number = 23, reading sector 149354
+RS03: try number = 24, reading sector 150763
+RS03: try number = 25, reading sector 152172
+RS03: try number = 26, reading sector 153581
+RS03: try number = 27, reading sector 154990
+RS03: try number = 28, reading sector 156399
+RS03: try number = 29, reading sector 157808
+RS03: try number = 30, reading sector 159217
+RS03: try number = 31, reading sector 160626
+RS03: try number = 32, reading sector 162035
+RS03: try number = 33, reading sector 163444
+RS03: try number = 34, reading sector 164853
+RS03: try number = 35, reading sector 166262
+RS03: try number = 36, reading sector 167671
+RS03: try number = 37, reading sector 169080
+RS03: try number = 38, reading sector 170489
+RS03: try number = 39, reading sector 171898
+RS03: try number = 40, reading sector 173307
+RS03: try number = 41, reading sector 174716
+RS03: try number = 42, reading sector 176125
+RS03: try number = 43, reading sector 177534
+RS03: try number = 44, reading sector 178943
+RS03: try number = 45, reading sector 180352
+RS03: try number = 46, reading sector 181761
+RS03: try number = 47, reading sector 183170
+RS03: try number = 48, reading sector 184579
+RS03: try number = 49, reading sector 185988
+RS03: try number = 50, reading sector 187397
+RS03: try number = 51, reading sector 188806
+RS03: try number = 52, reading sector 190215
+RS03: try number = 53, reading sector 191624
+RS03: try number = 54, reading sector 193033
+RS03: try number = 55, reading sector 194442
+RS03: try number = 56, reading sector 195851
+RS03: try number = 57, reading sector 197260
+RS03: try number = 58, reading sector 198669
+RS03: try number = 59, reading sector 200078
+RS03: try number = 60, reading sector 201487
+RS03: try number = 61, reading sector 202896
+RS03: try number = 62, reading sector 204305
+RS03: try number = 63, reading sector 205714
+RS03: try number = 64, reading sector 207123
+RS03: try number = 65, reading sector 208532
+RS03: try number = 66, reading sector 209941
+RS03: try number = 67, reading sector 211350
+RS03: try number = 68, reading sector 212759
+RS03: try number = 69, reading sector 214168
+RS03: try number = 70, reading sector 215577
+RS03: try number = 71, reading sector 216986
+RS03: try number = 72, reading sector 218395
+RS03: try number = 73, reading sector 219804
+RS03: try number = 74, reading sector 221213
+RS03: try number = 75, reading sector 222622
+RS03: try number = 76, reading sector 224031
+RS03: try number = 77, reading sector 225440
+RS03: try number = 78, reading sector 226849
+RS03: try number = 79, reading sector 228258
+RS03: try number = 80, reading sector 229667
+RS03: try number = 81, reading sector 231076
+RS03: try number = 82, reading sector 232485
+RS03: try number = 83, reading sector 233894
+RS03: try number = 84, reading sector 235303
 ** Success: sector 235303, rediscovered format with 87 roots
 ...augmented image found
 GetImageFingerprint(16): read & cached
--- a/regtest/database/RS03i_missing_header2
+++ b/regtest/database/RS03i_missing_header2
@@ -50,6 +50,7 @@ try_sector: trying sector 235219
 try_sector: read error, trying next header
 try_sector: trying sector 235069
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -139,8 +140,189 @@ RS03RecognizeImage: No EH, entering exhaustive search
 .. trying layer size 1409
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 118356
+RS03: try number = 2, reading sector 119765
+RS03: try number = 3, reading sector 121174
+RS03: try number = 4, reading sector 122583
+RS03: try number = 5, reading sector 123992
+RS03: try number = 6, reading sector 125401
+RS03: try number = 7, reading sector 126810
+RS03: try number = 8, reading sector 128219
+RS03: try number = 9, reading sector 129628
+RS03: try number = 10, reading sector 131037
+RS03: try number = 11, reading sector 132446
+RS03: try number = 12, reading sector 133855
+RS03: try number = 13, reading sector 135264
+RS03: try number = 14, reading sector 136673
+RS03: try number = 15, reading sector 138082
+RS03: try number = 16, reading sector 139491
+RS03: try number = 17, reading sector 140900
+RS03: try number = 18, reading sector 142309
+RS03: try number = 19, reading sector 143718
+RS03: try number = 20, reading sector 145127
+RS03: try number = 21, reading sector 146536
+RS03: try number = 22, reading sector 147945
+RS03: try number = 23, reading sector 149354
+RS03: try number = 24, reading sector 150763
+RS03: try number = 25, reading sector 152172
+RS03: try number = 26, reading sector 153581
+RS03: try number = 27, reading sector 154990
+RS03: try number = 28, reading sector 156399
+RS03: try number = 29, reading sector 157808
+RS03: try number = 30, reading sector 159217
+RS03: try number = 31, reading sector 160626
+RS03: try number = 32, reading sector 162035
+RS03: try number = 33, reading sector 163444
+RS03: try number = 34, reading sector 164853
+RS03: try number = 35, reading sector 166262
+RS03: try number = 36, reading sector 167671
+RS03: try number = 37, reading sector 169080
+RS03: try number = 38, reading sector 170489
+RS03: try number = 39, reading sector 171898
+RS03: try number = 40, reading sector 173307
+RS03: try number = 41, reading sector 174716
+RS03: try number = 42, reading sector 176125
+RS03: try number = 43, reading sector 177534
+RS03: try number = 44, reading sector 178943
+RS03: try number = 45, reading sector 180352
+RS03: try number = 46, reading sector 181761
+RS03: try number = 47, reading sector 183170
+RS03: try number = 48, reading sector 184579
+RS03: try number = 49, reading sector 185988
+RS03: try number = 50, reading sector 187397
+RS03: try number = 51, reading sector 188806
+RS03: try number = 52, reading sector 190215
+RS03: try number = 53, reading sector 191624
+RS03: try number = 54, reading sector 193033
+RS03: try number = 55, reading sector 194442
+RS03: try number = 56, reading sector 195851
+RS03: try number = 57, reading sector 197260
+RS03: try number = 58, reading sector 198669
+RS03: try number = 59, reading sector 200078
+RS03: try number = 60, reading sector 201487
+RS03: try number = 61, reading sector 202896
+RS03: try number = 62, reading sector 204305
+RS03: try number = 63, reading sector 205714
+RS03: try number = 64, reading sector 207123
+RS03: try number = 65, reading sector 208532
+RS03: try number = 66, reading sector 209941
+RS03: try number = 67, reading sector 211350
+RS03: try number = 68, reading sector 212759
+RS03: try number = 69, reading sector 214168
+RS03: try number = 70, reading sector 215577
+RS03: try number = 71, reading sector 216986
+RS03: try number = 72, reading sector 218395
+RS03: try number = 73, reading sector 219804
+RS03: try number = 74, reading sector 221213
+RS03: try number = 75, reading sector 222622
+RS03: try number = 76, reading sector 224031
+RS03: try number = 77, reading sector 225440
+RS03: try number = 78, reading sector 226849
+RS03: try number = 79, reading sector 228258
+RS03: try number = 80, reading sector 229667
+RS03: try number = 81, reading sector 231076
+RS03: try number = 82, reading sector 232485
+RS03: try number = 83, reading sector 233894
+RS03: try number = 84, reading sector 235303
+RS03: try number = 85, reading sector 236712
+RS03: try number = 86, reading sector 238121
+RS03: try number = 87, reading sector 239530
+RS03: try number = 88, reading sector 240939
+RS03: try number = 89, reading sector 242348
+RS03: try number = 90, reading sector 243757
+RS03: try number = 91, reading sector 245166
+RS03: try number = 92, reading sector 246575
+RS03: try number = 93, reading sector 247984
+RS03: try number = 94, reading sector 249393
+RS03: try number = 95, reading sector 250802
+RS03: try number = 96, reading sector 252211
+RS03: try number = 97, reading sector 253620
+RS03: try number = 98, reading sector 255029
+RS03: try number = 99, reading sector 256438
+RS03: try number = 100, reading sector 257847
+RS03: try number = 101, reading sector 259256
+RS03: try number = 102, reading sector 260665
+RS03: try number = 103, reading sector 262074
+RS03: try number = 104, reading sector 263483
+RS03: try number = 105, reading sector 264892
+RS03: try number = 106, reading sector 266301
+RS03: try number = 107, reading sector 267710
+RS03: try number = 108, reading sector 269119
+RS03: try number = 109, reading sector 270528
+RS03: try number = 110, reading sector 271937
+RS03: try number = 111, reading sector 273346
+RS03: try number = 112, reading sector 274755
+RS03: try number = 113, reading sector 276164
+RS03: try number = 114, reading sector 277573
+RS03: try number = 115, reading sector 278982
+RS03: try number = 116, reading sector 280391
+RS03: try number = 117, reading sector 281800
+RS03: try number = 118, reading sector 283209
+RS03: try number = 119, reading sector 284618
+RS03: try number = 120, reading sector 286027
+RS03: try number = 121, reading sector 287436
+RS03: try number = 122, reading sector 288845
+RS03: try number = 123, reading sector 290254
+RS03: try number = 124, reading sector 291663
+RS03: try number = 125, reading sector 293072
+RS03: try number = 126, reading sector 294481
+RS03: try number = 127, reading sector 295890
+RS03: try number = 128, reading sector 297299
+RS03: try number = 129, reading sector 298708
+RS03: try number = 130, reading sector 300117
+RS03: try number = 131, reading sector 301526
+RS03: try number = 132, reading sector 302935
+RS03: try number = 133, reading sector 304344
+RS03: try number = 134, reading sector 305753
+RS03: try number = 135, reading sector 307162
+RS03: try number = 136, reading sector 308571
+RS03: try number = 137, reading sector 309980
+RS03: try number = 138, reading sector 311389
+RS03: try number = 139, reading sector 312798
+RS03: try number = 140, reading sector 314207
+RS03: try number = 141, reading sector 315616
+RS03: try number = 142, reading sector 317025
+RS03: try number = 143, reading sector 318434
+RS03: try number = 144, reading sector 319843
+RS03: try number = 145, reading sector 321252
+RS03: try number = 146, reading sector 322661
+RS03: try number = 147, reading sector 324070
+RS03: try number = 148, reading sector 325479
+RS03: try number = 149, reading sector 326888
+RS03: try number = 150, reading sector 328297
+RS03: try number = 151, reading sector 329706
+RS03: try number = 152, reading sector 331115
+RS03: try number = 153, reading sector 332524
+RS03: try number = 154, reading sector 333933
+RS03: try number = 155, reading sector 335342
+RS03: try number = 156, reading sector 336751
+RS03: try number = 157, reading sector 338160
+RS03: try number = 158, reading sector 339569
+RS03: try number = 159, reading sector 340978
+RS03: try number = 160, reading sector 342387
+RS03: try number = 161, reading sector 343796
+RS03: try number = 162, reading sector 345205
+RS03: try number = 163, reading sector 346614
+RS03: try number = 164, reading sector 348023
 -> 17 untested layers remaining
 - layer slice 1
+RS03: try number = 165, reading sector 169081
+RS03: try number = 166, reading sector 170490
+RS03: try number = 167, reading sector 171899
+RS03: try number = 168, reading sector 173308
+RS03: try number = 169, reading sector 174717
+RS03: try number = 170, reading sector 176126
+RS03: try number = 171, reading sector 177535
+RS03: try number = 172, reading sector 178944
+RS03: try number = 173, reading sector 180353
+RS03: try number = 174, reading sector 181762
+RS03: try number = 175, reading sector 183171
+RS03: try number = 176, reading sector 184580
+RS03: try number = 177, reading sector 185989
+RS03: try number = 178, reading sector 187398
+RS03: try number = 179, reading sector 188807
+RS03: try number = 180, reading sector 190216
+RS03: try number = 181, reading sector 235304
 ** Success: sector 235304, rediscovered format with 87 roots
 ...augmented image found
 GetImageFingerprint(16): read & cached
--- a/regtest/database/RS03i_missing_header3
+++ b/regtest/database/RS03i_missing_header3
@@ -50,6 +50,7 @@ try_sector: trying sector 235219
 try_sector: read error, trying next header
 try_sector: trying sector 235069
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -139,18 +140,414 @@ RS03RecognizeImage: No EH, entering exhaustive search
 .. trying layer size 1409
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 118356
+RS03: try number = 2, reading sector 119765
+RS03: try number = 3, reading sector 121174
+RS03: try number = 4, reading sector 122583
+RS03: try number = 5, reading sector 123992
+RS03: try number = 6, reading sector 125401
+RS03: try number = 7, reading sector 126810
+RS03: try number = 8, reading sector 128219
+RS03: try number = 9, reading sector 129628
+RS03: try number = 10, reading sector 131037
+RS03: try number = 11, reading sector 132446
+RS03: try number = 12, reading sector 133855
+RS03: try number = 13, reading sector 135264
+RS03: try number = 14, reading sector 136673
+RS03: try number = 15, reading sector 138082
+RS03: try number = 16, reading sector 139491
+RS03: try number = 17, reading sector 140900
+RS03: try number = 18, reading sector 142309
+RS03: try number = 19, reading sector 143718
+RS03: try number = 20, reading sector 145127
+RS03: try number = 21, reading sector 146536
+RS03: try number = 22, reading sector 147945
+RS03: try number = 23, reading sector 149354
+RS03: try number = 24, reading sector 150763
+RS03: try number = 25, reading sector 152172
+RS03: try number = 26, reading sector 153581
+RS03: try number = 27, reading sector 154990
+RS03: try number = 28, reading sector 156399
+RS03: try number = 29, reading sector 157808
+RS03: try number = 30, reading sector 159217
+RS03: try number = 31, reading sector 160626
+RS03: try number = 32, reading sector 162035
+RS03: try number = 33, reading sector 163444
+RS03: try number = 34, reading sector 164853
+RS03: try number = 35, reading sector 166262
+RS03: try number = 36, reading sector 167671
+RS03: try number = 37, reading sector 169080
+RS03: try number = 38, reading sector 170489
+RS03: try number = 39, reading sector 171898
+RS03: try number = 40, reading sector 173307
+RS03: try number = 41, reading sector 174716
+RS03: try number = 42, reading sector 176125
+RS03: try number = 43, reading sector 177534
+RS03: try number = 44, reading sector 178943
+RS03: try number = 45, reading sector 180352
+RS03: try number = 46, reading sector 181761
+RS03: try number = 47, reading sector 183170
+RS03: try number = 48, reading sector 184579
+RS03: try number = 49, reading sector 185988
+RS03: try number = 50, reading sector 187397
+RS03: try number = 51, reading sector 188806
+RS03: try number = 52, reading sector 190215
+RS03: try number = 53, reading sector 191624
+RS03: try number = 54, reading sector 193033
+RS03: try number = 55, reading sector 194442
+RS03: try number = 56, reading sector 195851
+RS03: try number = 57, reading sector 197260
+RS03: try number = 58, reading sector 198669
+RS03: try number = 59, reading sector 200078
+RS03: try number = 60, reading sector 201487
+RS03: try number = 61, reading sector 202896
+RS03: try number = 62, reading sector 204305
+RS03: try number = 63, reading sector 205714
+RS03: try number = 64, reading sector 207123
+RS03: try number = 65, reading sector 208532
+RS03: try number = 66, reading sector 209941
+RS03: try number = 67, reading sector 211350
+RS03: try number = 68, reading sector 212759
+RS03: try number = 69, reading sector 214168
+RS03: try number = 70, reading sector 215577
+RS03: try number = 71, reading sector 216986
+RS03: try number = 72, reading sector 218395
+RS03: try number = 73, reading sector 219804
+RS03: try number = 74, reading sector 221213
+RS03: try number = 75, reading sector 222622
+RS03: try number = 76, reading sector 224031
+RS03: try number = 77, reading sector 225440
+RS03: try number = 78, reading sector 226849
+RS03: try number = 79, reading sector 228258
+RS03: try number = 80, reading sector 229667
+RS03: try number = 81, reading sector 231076
+RS03: try number = 82, reading sector 232485
+RS03: try number = 83, reading sector 233894
+RS03: try number = 84, reading sector 235303
+RS03: try number = 85, reading sector 236712
+RS03: try number = 86, reading sector 238121
+RS03: try number = 87, reading sector 239530
+RS03: try number = 88, reading sector 240939
+RS03: try number = 89, reading sector 242348
+RS03: try number = 90, reading sector 243757
+RS03: try number = 91, reading sector 245166
+RS03: try number = 92, reading sector 246575
+RS03: try number = 93, reading sector 247984
+RS03: try number = 94, reading sector 249393
+RS03: try number = 95, reading sector 250802
+RS03: try number = 96, reading sector 252211
+RS03: try number = 97, reading sector 253620
+RS03: try number = 98, reading sector 255029
+RS03: try number = 99, reading sector 256438
+RS03: try number = 100, reading sector 257847
+RS03: try number = 101, reading sector 259256
+RS03: try number = 102, reading sector 260665
+RS03: try number = 103, reading sector 262074
+RS03: try number = 104, reading sector 263483
+RS03: try number = 105, reading sector 264892
+RS03: try number = 106, reading sector 266301
+RS03: try number = 107, reading sector 267710
+RS03: try number = 108, reading sector 269119
+RS03: try number = 109, reading sector 270528
+RS03: try number = 110, reading sector 271937
+RS03: try number = 111, reading sector 273346
+RS03: try number = 112, reading sector 274755
+RS03: try number = 113, reading sector 276164
+RS03: try number = 114, reading sector 277573
+RS03: try number = 115, reading sector 278982
+RS03: try number = 116, reading sector 280391
+RS03: try number = 117, reading sector 281800
+RS03: try number = 118, reading sector 283209
+RS03: try number = 119, reading sector 284618
+RS03: try number = 120, reading sector 286027
+RS03: try number = 121, reading sector 287436
+RS03: try number = 122, reading sector 288845
+RS03: try number = 123, reading sector 290254
+RS03: try number = 124, reading sector 291663
+RS03: try number = 125, reading sector 293072
+RS03: try number = 126, reading sector 294481
+RS03: try number = 127, reading sector 295890
+RS03: try number = 128, reading sector 297299
+RS03: try number = 129, reading sector 298708
+RS03: try number = 130, reading sector 300117
+RS03: try number = 131, reading sector 301526
+RS03: try number = 132, reading sector 302935
+RS03: try number = 133, reading sector 304344
+RS03: try number = 134, reading sector 305753
+RS03: try number = 135, reading sector 307162
+RS03: try number = 136, reading sector 308571
+RS03: try number = 137, reading sector 309980
+RS03: try number = 138, reading sector 311389
+RS03: try number = 139, reading sector 312798
+RS03: try number = 140, reading sector 314207
+RS03: try number = 141, reading sector 315616
+RS03: try number = 142, reading sector 317025
+RS03: try number = 143, reading sector 318434
+RS03: try number = 144, reading sector 319843
+RS03: try number = 145, reading sector 321252
+RS03: try number = 146, reading sector 322661
+RS03: try number = 147, reading sector 324070
+RS03: try number = 148, reading sector 325479
+RS03: try number = 149, reading sector 326888
+RS03: try number = 150, reading sector 328297
+RS03: try number = 151, reading sector 329706
+RS03: try number = 152, reading sector 331115
+RS03: try number = 153, reading sector 332524
+RS03: try number = 154, reading sector 333933
+RS03: try number = 155, reading sector 335342
+RS03: try number = 156, reading sector 336751
+RS03: try number = 157, reading sector 338160
+RS03: try number = 158, reading sector 339569
+RS03: try number = 159, reading sector 340978
+RS03: try number = 160, reading sector 342387
+RS03: try number = 161, reading sector 343796
+RS03: try number = 162, reading sector 345205
+RS03: try number = 163, reading sector 346614
+RS03: try number = 164, reading sector 348023
 -> 136 untested layers remaining
 - layer slice 1
+RS03: try number = 165, reading sector 140901
+RS03: try number = 166, reading sector 142310
+RS03: try number = 167, reading sector 143719
+RS03: try number = 168, reading sector 145128
+RS03: try number = 169, reading sector 146537
+RS03: try number = 170, reading sector 147946
+RS03: try number = 171, reading sector 149355
+RS03: try number = 172, reading sector 150764
+RS03: try number = 173, reading sector 152173
+RS03: try number = 174, reading sector 153582
+RS03: try number = 175, reading sector 154991
+RS03: try number = 176, reading sector 156400
+RS03: try number = 177, reading sector 157809
+RS03: try number = 178, reading sector 159218
+RS03: try number = 179, reading sector 160627
+RS03: try number = 180, reading sector 162036
+RS03: try number = 181, reading sector 163445
+RS03: try number = 182, reading sector 164854
+RS03: try number = 183, reading sector 166263
+RS03: try number = 184, reading sector 167672
+RS03: try number = 185, reading sector 169081
+RS03: try number = 186, reading sector 170490
+RS03: try number = 187, reading sector 171899
+RS03: try number = 188, reading sector 173308
+RS03: try number = 189, reading sector 174717
+RS03: try number = 190, reading sector 176126
+RS03: try number = 191, reading sector 177535
+RS03: try number = 192, reading sector 178944
+RS03: try number = 193, reading sector 180353
+RS03: try number = 194, reading sector 181762
+RS03: try number = 195, reading sector 183171
+RS03: try number = 196, reading sector 184580
+RS03: try number = 197, reading sector 185989
+RS03: try number = 198, reading sector 187398
+RS03: try number = 199, reading sector 188807
+RS03: try number = 200, reading sector 190216
+RS03: try number = 201, reading sector 191625
+RS03: try number = 202, reading sector 193034
+RS03: try number = 203, reading sector 194443
+RS03: try number = 204, reading sector 195852
+RS03: try number = 205, reading sector 197261
+RS03: try number = 206, reading sector 198670
+RS03: try number = 207, reading sector 200079
+RS03: try number = 208, reading sector 201488
+RS03: try number = 209, reading sector 202897
+RS03: try number = 210, reading sector 204306
+RS03: try number = 211, reading sector 205715
+RS03: try number = 212, reading sector 207124
+RS03: try number = 213, reading sector 208533
+RS03: try number = 214, reading sector 209942
+RS03: try number = 215, reading sector 211351
+RS03: try number = 216, reading sector 212760
+RS03: try number = 217, reading sector 214169
+RS03: try number = 218, reading sector 215578
+RS03: try number = 219, reading sector 216987
+RS03: try number = 220, reading sector 218396
+RS03: try number = 221, reading sector 219805
+RS03: try number = 222, reading sector 221214
+RS03: try number = 223, reading sector 222623
+RS03: try number = 224, reading sector 224032
+RS03: try number = 225, reading sector 225441
+RS03: try number = 226, reading sector 226850
+RS03: try number = 227, reading sector 228259
+RS03: try number = 228, reading sector 229668
+RS03: try number = 229, reading sector 231077
+RS03: try number = 230, reading sector 232486
+RS03: try number = 231, reading sector 233895
+RS03: try number = 232, reading sector 235304
 .. invalid CRC block 235304
+RS03: try number = 233, reading sector 236713
+RS03: try number = 234, reading sector 238122
+RS03: try number = 235, reading sector 239531
+RS03: try number = 236, reading sector 240940
+RS03: try number = 237, reading sector 242349
+RS03: try number = 238, reading sector 243758
+RS03: try number = 239, reading sector 245167
+RS03: try number = 240, reading sector 246576
+RS03: try number = 241, reading sector 247985
+RS03: try number = 242, reading sector 249394
+RS03: try number = 243, reading sector 250803
+RS03: try number = 244, reading sector 252212
+RS03: try number = 245, reading sector 253621
+RS03: try number = 246, reading sector 255030
+RS03: try number = 247, reading sector 256439
+RS03: try number = 248, reading sector 257848
+RS03: try number = 249, reading sector 259257
+RS03: try number = 250, reading sector 260666
+RS03: try number = 251, reading sector 262075
+RS03: try number = 252, reading sector 263484
+RS03: try number = 253, reading sector 264893
+RS03: try number = 254, reading sector 266302
+RS03: try number = 255, reading sector 267711
+RS03: try number = 256, reading sector 269120
+RS03: try number = 257, reading sector 270529
+RS03: try number = 258, reading sector 271938
+RS03: try number = 259, reading sector 273347
+RS03: try number = 260, reading sector 274756
+RS03: try number = 261, reading sector 276165
+RS03: try number = 262, reading sector 277574
+RS03: try number = 263, reading sector 278983
+RS03: try number = 264, reading sector 280392
+RS03: try number = 265, reading sector 281801
+RS03: try number = 266, reading sector 283210
+RS03: try number = 267, reading sector 284619
+RS03: try number = 268, reading sector 286028
+RS03: try number = 269, reading sector 287437
+RS03: try number = 270, reading sector 288846
+RS03: try number = 271, reading sector 290255
+RS03: try number = 272, reading sector 291664
+RS03: try number = 273, reading sector 293073
+RS03: try number = 274, reading sector 294482
+RS03: try number = 275, reading sector 295891
+RS03: try number = 276, reading sector 297300
+RS03: try number = 277, reading sector 298709
+RS03: try number = 278, reading sector 300118
+RS03: try number = 279, reading sector 301527
+RS03: try number = 280, reading sector 302936
+RS03: try number = 281, reading sector 304345
+RS03: try number = 282, reading sector 305754
+RS03: try number = 283, reading sector 307163
+RS03: try number = 284, reading sector 308572
+RS03: try number = 285, reading sector 309981
+RS03: try number = 286, reading sector 311390
+RS03: try number = 287, reading sector 312799
+RS03: try number = 288, reading sector 314208
+RS03: try number = 289, reading sector 315617
+RS03: try number = 290, reading sector 317026
+RS03: try number = 291, reading sector 318435
+RS03: try number = 292, reading sector 319844
+RS03: try number = 293, reading sector 321253
+RS03: try number = 294, reading sector 322662
+RS03: try number = 295, reading sector 324071
+RS03: try number = 296, reading sector 325480
+RS03: try number = 297, reading sector 326889
+RS03: try number = 298, reading sector 328298
+RS03: try number = 299, reading sector 329707
+RS03: try number = 300, reading sector 331116
 -> 32 untested layers remaining
 - layer slice 2
+RS03: try number = 301, reading sector 154992
+RS03: try number = 302, reading sector 156401
+RS03: try number = 303, reading sector 157810
+RS03: try number = 304, reading sector 159219
+RS03: try number = 305, reading sector 160628
+RS03: try number = 306, reading sector 162037
+RS03: try number = 307, reading sector 163446
+RS03: try number = 308, reading sector 164855
+RS03: try number = 309, reading sector 166264
+RS03: try number = 310, reading sector 167673
+RS03: try number = 311, reading sector 169082
+RS03: try number = 312, reading sector 170491
+RS03: try number = 313, reading sector 171900
+RS03: try number = 314, reading sector 173309
+RS03: try number = 315, reading sector 174718
+RS03: try number = 316, reading sector 176127
+RS03: try number = 317, reading sector 177536
+RS03: try number = 318, reading sector 178945
+RS03: try number = 319, reading sector 180354
+RS03: try number = 320, reading sector 181763
+RS03: try number = 321, reading sector 183172
+RS03: try number = 322, reading sector 184581
+RS03: try number = 323, reading sector 185990
+RS03: try number = 324, reading sector 187399
+RS03: try number = 325, reading sector 188808
+RS03: try number = 326, reading sector 190217
+RS03: try number = 327, reading sector 191626
+RS03: try number = 328, reading sector 193035
+RS03: try number = 329, reading sector 194444
+RS03: try number = 330, reading sector 195853
+RS03: try number = 331, reading sector 197262
+RS03: try number = 332, reading sector 235305
 -> 32 untested layers remaining
 - layer slice 3
+RS03: try number = 333, reading sector 154993
+RS03: try number = 334, reading sector 156402
+RS03: try number = 335, reading sector 157811
+RS03: try number = 336, reading sector 159220
+RS03: try number = 337, reading sector 160629
+RS03: try number = 338, reading sector 162038
+RS03: try number = 339, reading sector 163447
+RS03: try number = 340, reading sector 164856
+RS03: try number = 341, reading sector 166265
+RS03: try number = 342, reading sector 167674
+RS03: try number = 343, reading sector 169083
+RS03: try number = 344, reading sector 170492
+RS03: try number = 345, reading sector 171901
+RS03: try number = 346, reading sector 173310
+RS03: try number = 347, reading sector 174719
+RS03: try number = 348, reading sector 176128
+RS03: try number = 349, reading sector 177537
+RS03: try number = 350, reading sector 178946
+RS03: try number = 351, reading sector 180355
+RS03: try number = 352, reading sector 181764
+RS03: try number = 353, reading sector 183173
+RS03: try number = 354, reading sector 184582
+RS03: try number = 355, reading sector 185991
+RS03: try number = 356, reading sector 187400
+RS03: try number = 357, reading sector 188809
+RS03: try number = 358, reading sector 190218
+RS03: try number = 359, reading sector 191627
+RS03: try number = 360, reading sector 193036
+RS03: try number = 361, reading sector 194445
+RS03: try number = 362, reading sector 195854
+RS03: try number = 363, reading sector 197263
+RS03: try number = 364, reading sector 235306
 .. invalid CRC block 235306
 -> 31 untested layers remaining
 - layer slice 4
+RS03: try number = 365, reading sector 154994
+RS03: try number = 366, reading sector 156403
+RS03: try number = 367, reading sector 157812
+RS03: try number = 368, reading sector 159221
+RS03: try number = 369, reading sector 160630
+RS03: try number = 370, reading sector 162039
+RS03: try number = 371, reading sector 163448
+RS03: try number = 372, reading sector 164857
+RS03: try number = 373, reading sector 166266
+RS03: try number = 374, reading sector 167675
+RS03: try number = 375, reading sector 169084
+RS03: try number = 376, reading sector 170493
+RS03: try number = 377, reading sector 171902
+RS03: try number = 378, reading sector 173311
+RS03: try number = 379, reading sector 174720
+RS03: try number = 380, reading sector 176129
+RS03: try number = 381, reading sector 177538
+RS03: try number = 382, reading sector 178947
+RS03: try number = 383, reading sector 180356
+RS03: try number = 384, reading sector 181765
+RS03: try number = 385, reading sector 183174
+RS03: try number = 386, reading sector 184583
+RS03: try number = 387, reading sector 185992
+RS03: try number = 388, reading sector 187401
+RS03: try number = 389, reading sector 188810
+RS03: try number = 390, reading sector 190219
+RS03: try number = 391, reading sector 191628
+RS03: try number = 392, reading sector 193037
+RS03: try number = 393, reading sector 194446
+RS03: try number = 394, reading sector 195855
+RS03: try number = 395, reading sector 235307
 -> 1 untested layers remaining
 - layer slice 5
+RS03: try number = 396, reading sector 235308
 ** Success: sector 235308, rediscovered format with 87 roots
 ...augmented image found
 GetImageFingerprint(16): read & cached
--- a/regtest/database/RS03i_missing_header4
+++ b/regtest/database/RS03i_missing_header4
--- a/regtest/database/RS03i_missing_header_no_crcsec
+++ b/regtest/database/RS03i_missing_header_no_crcsec
--- a/regtest/database/RS03i_missing_header_truncated
+++ b/regtest/database/RS03i_missing_header_truncated
@@ -50,6 +50,7 @@ try_sector: trying sector 235219
 try_sector: read error, trying next header
 try_sector: trying sector 235069
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -138,8 +139,154 @@ RS03RecognizeImage: No EH, entering exhaustive search
 .. trying layer size 1409
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 118356
+RS03: try number = 2, reading sector 119765
+RS03: try number = 3, reading sector 121174
+RS03: try number = 4, reading sector 122583
+RS03: try number = 5, reading sector 123992
+RS03: try number = 6, reading sector 125401
+RS03: try number = 7, reading sector 126810
+RS03: try number = 8, reading sector 128219
+RS03: try number = 9, reading sector 129628
+RS03: try number = 10, reading sector 131037
+RS03: try number = 11, reading sector 132446
+RS03: try number = 12, reading sector 133855
+RS03: try number = 13, reading sector 135264
+RS03: try number = 14, reading sector 136673
+RS03: try number = 15, reading sector 138082
+RS03: try number = 16, reading sector 139491
+RS03: try number = 17, reading sector 140900
+RS03: try number = 18, reading sector 142309
+RS03: try number = 19, reading sector 143718
+RS03: try number = 20, reading sector 145127
+RS03: try number = 21, reading sector 146536
+RS03: try number = 22, reading sector 147945
+RS03: try number = 23, reading sector 149354
+RS03: try number = 24, reading sector 150763
+RS03: try number = 25, reading sector 152172
+RS03: try number = 26, reading sector 153581
+RS03: try number = 27, reading sector 154990
+RS03: try number = 28, reading sector 156399
+RS03: try number = 29, reading sector 157808
+RS03: try number = 30, reading sector 159217
+RS03: try number = 31, reading sector 160626
+RS03: try number = 32, reading sector 162035
+RS03: try number = 33, reading sector 163444
+RS03: try number = 34, reading sector 164853
+RS03: try number = 35, reading sector 166262
+RS03: try number = 36, reading sector 167671
+RS03: try number = 37, reading sector 169080
+RS03: try number = 38, reading sector 170489
+RS03: try number = 39, reading sector 171898
+RS03: try number = 40, reading sector 173307
+RS03: try number = 41, reading sector 174716
+RS03: try number = 42, reading sector 176125
+RS03: try number = 43, reading sector 177534
+RS03: try number = 44, reading sector 178943
+RS03: try number = 45, reading sector 180352
+RS03: try number = 46, reading sector 181761
+RS03: try number = 47, reading sector 183170
+RS03: try number = 48, reading sector 184579
+RS03: try number = 49, reading sector 185988
+RS03: try number = 50, reading sector 187397
+RS03: try number = 51, reading sector 188806
+RS03: try number = 52, reading sector 190215
+RS03: try number = 53, reading sector 191624
+RS03: try number = 54, reading sector 193033
+RS03: try number = 55, reading sector 194442
+RS03: try number = 56, reading sector 195851
+RS03: try number = 57, reading sector 197260
+RS03: try number = 58, reading sector 198669
+RS03: try number = 59, reading sector 200078
+RS03: try number = 60, reading sector 201487
+RS03: try number = 61, reading sector 202896
+RS03: try number = 62, reading sector 204305
+RS03: try number = 63, reading sector 205714
+RS03: try number = 64, reading sector 207123
+RS03: try number = 65, reading sector 208532
+RS03: try number = 66, reading sector 209941
+RS03: try number = 67, reading sector 211350
+RS03: try number = 68, reading sector 212759
+RS03: try number = 69, reading sector 214168
+RS03: try number = 70, reading sector 215577
+RS03: try number = 71, reading sector 216986
+RS03: try number = 72, reading sector 218395
+RS03: try number = 73, reading sector 219804
+RS03: try number = 74, reading sector 221213
+RS03: try number = 75, reading sector 222622
+RS03: try number = 76, reading sector 224031
+RS03: try number = 77, reading sector 225440
+RS03: try number = 78, reading sector 226849
+RS03: try number = 79, reading sector 228258
+RS03: try number = 80, reading sector 229667
+RS03: try number = 81, reading sector 231076
+RS03: try number = 82, reading sector 232485
+RS03: try number = 83, reading sector 233894
+RS03: try number = 84, reading sector 235303
+RS03: try number = 85, reading sector 236712
+RS03: try number = 86, reading sector 238121
+RS03: try number = 87, reading sector 239530
+RS03: try number = 88, reading sector 240939
+RS03: try number = 89, reading sector 242348
+RS03: try number = 90, reading sector 243757
+RS03: try number = 91, reading sector 245166
+RS03: try number = 92, reading sector 246575
+RS03: try number = 93, reading sector 247984
+RS03: try number = 94, reading sector 249393
+RS03: try number = 95, reading sector 250802
+RS03: try number = 96, reading sector 252211
+RS03: try number = 97, reading sector 253620
+RS03: try number = 98, reading sector 255029
+RS03: try number = 99, reading sector 256438
+RS03: try number = 100, reading sector 257847
+RS03: try number = 101, reading sector 259256
+RS03: try number = 102, reading sector 260665
+RS03: try number = 103, reading sector 262074
+RS03: try number = 104, reading sector 263483
+RS03: try number = 105, reading sector 264892
+RS03: try number = 106, reading sector 266301
+RS03: try number = 107, reading sector 267710
+RS03: try number = 108, reading sector 269119
+RS03: try number = 109, reading sector 270528
+RS03: try number = 110, reading sector 271937
+RS03: try number = 111, reading sector 273346
+RS03: try number = 112, reading sector 274755
+RS03: try number = 113, reading sector 276164
+RS03: try number = 114, reading sector 277573
+RS03: try number = 115, reading sector 278982
+RS03: try number = 116, reading sector 280391
+RS03: try number = 117, reading sector 281800
+RS03: try number = 118, reading sector 283209
+RS03: try number = 119, reading sector 284618
+RS03: try number = 120, reading sector 286027
+RS03: try number = 121, reading sector 287436
+RS03: try number = 122, reading sector 288845
+RS03: try number = 123, reading sector 290254
+RS03: try number = 124, reading sector 291663
+RS03: try number = 125, reading sector 293072
+RS03: try number = 126, reading sector 294481
+RS03: try number = 127, reading sector 295890
+RS03: try number = 128, reading sector 297299
+RS03: try number = 129, reading sector 298708
 -> 17 untested layers remaining
 - layer slice 1
+RS03: try number = 130, reading sector 169081
+RS03: try number = 131, reading sector 170490
+RS03: try number = 132, reading sector 171899
+RS03: try number = 133, reading sector 173308
+RS03: try number = 134, reading sector 174717
+RS03: try number = 135, reading sector 176126
+RS03: try number = 136, reading sector 177535
+RS03: try number = 137, reading sector 178944
+RS03: try number = 138, reading sector 180353
+RS03: try number = 139, reading sector 181762
+RS03: try number = 140, reading sector 183171
+RS03: try number = 141, reading sector 184580
+RS03: try number = 142, reading sector 185989
+RS03: try number = 143, reading sector 187398
+RS03: try number = 144, reading sector 188807
+RS03: try number = 145, reading sector 190216
+RS03: try number = 146, reading sector 235304
 ** Success: sector 235304, rediscovered format with 87 roots
 ...augmented image found
 GetImageFingerprint(16): read & cached
--- a/regtest/database/RS03i_missing_iso_header
+++ b/regtest/database/RS03i_missing_iso_header
@@ -26,6 +26,7 @@ ExamineECC() started
 ...trying RS01
 ...trying RS02
 RS02Recognize: file rs03i-tmp.iso
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -116,6 +117,90 @@ RS03RecognizeImage: No EH, entering exhaustive search
 .. trying layer size 1409
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 118356
+RS03: try number = 2, reading sector 119765
+RS03: try number = 3, reading sector 121174
+RS03: try number = 4, reading sector 122583
+RS03: try number = 5, reading sector 123992
+RS03: try number = 6, reading sector 125401
+RS03: try number = 7, reading sector 126810
+RS03: try number = 8, reading sector 128219
+RS03: try number = 9, reading sector 129628
+RS03: try number = 10, reading sector 131037
+RS03: try number = 11, reading sector 132446
+RS03: try number = 12, reading sector 133855
+RS03: try number = 13, reading sector 135264
+RS03: try number = 14, reading sector 136673
+RS03: try number = 15, reading sector 138082
+RS03: try number = 16, reading sector 139491
+RS03: try number = 17, reading sector 140900
+RS03: try number = 18, reading sector 142309
+RS03: try number = 19, reading sector 143718
+RS03: try number = 20, reading sector 145127
+RS03: try number = 21, reading sector 146536
+RS03: try number = 22, reading sector 147945
+RS03: try number = 23, reading sector 149354
+RS03: try number = 24, reading sector 150763
+RS03: try number = 25, reading sector 152172
+RS03: try number = 26, reading sector 153581
+RS03: try number = 27, reading sector 154990
+RS03: try number = 28, reading sector 156399
+RS03: try number = 29, reading sector 157808
+RS03: try number = 30, reading sector 159217
+RS03: try number = 31, reading sector 160626
+RS03: try number = 32, reading sector 162035
+RS03: try number = 33, reading sector 163444
+RS03: try number = 34, reading sector 164853
+RS03: try number = 35, reading sector 166262
+RS03: try number = 36, reading sector 167671
+RS03: try number = 37, reading sector 169080
+RS03: try number = 38, reading sector 170489
+RS03: try number = 39, reading sector 171898
+RS03: try number = 40, reading sector 173307
+RS03: try number = 41, reading sector 174716
+RS03: try number = 42, reading sector 176125
+RS03: try number = 43, reading sector 177534
+RS03: try number = 44, reading sector 178943
+RS03: try number = 45, reading sector 180352
+RS03: try number = 46, reading sector 181761
+RS03: try number = 47, reading sector 183170
+RS03: try number = 48, reading sector 184579
+RS03: try number = 49, reading sector 185988
+RS03: try number = 50, reading sector 187397
+RS03: try number = 51, reading sector 188806
+RS03: try number = 52, reading sector 190215
+RS03: try number = 53, reading sector 191624
+RS03: try number = 54, reading sector 193033
+RS03: try number = 55, reading sector 194442
+RS03: try number = 56, reading sector 195851
+RS03: try number = 57, reading sector 197260
+RS03: try number = 58, reading sector 198669
+RS03: try number = 59, reading sector 200078
+RS03: try number = 60, reading sector 201487
+RS03: try number = 61, reading sector 202896
+RS03: try number = 62, reading sector 204305
+RS03: try number = 63, reading sector 205714
+RS03: try number = 64, reading sector 207123
+RS03: try number = 65, reading sector 208532
+RS03: try number = 66, reading sector 209941
+RS03: try number = 67, reading sector 211350
+RS03: try number = 68, reading sector 212759
+RS03: try number = 69, reading sector 214168
+RS03: try number = 70, reading sector 215577
+RS03: try number = 71, reading sector 216986
+RS03: try number = 72, reading sector 218395
+RS03: try number = 73, reading sector 219804
+RS03: try number = 74, reading sector 221213
+RS03: try number = 75, reading sector 222622
+RS03: try number = 76, reading sector 224031
+RS03: try number = 77, reading sector 225440
+RS03: try number = 78, reading sector 226849
+RS03: try number = 79, reading sector 228258
+RS03: try number = 80, reading sector 229667
+RS03: try number = 81, reading sector 231076
+RS03: try number = 82, reading sector 232485
+RS03: try number = 83, reading sector 233894
+RS03: try number = 84, reading sector 235303
 ** Success: sector 235303, rediscovered format with 87 roots
 ...augmented image found
 GetImageFingerprint(16): not readable
--- a/regtest/database/RS03i_plus_56_bytes
+++ b/regtest/database/RS03i_plus_56_bytes
@@ -50,6 +50,7 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -130,6 +131,138 @@ Warning: image size set to 25000 for debugging!
 .. trying layer size 98
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 8232
+RS03: try number = 2, reading sector 8330
+RS03: try number = 3, reading sector 8428
+RS03: try number = 4, reading sector 8526
+RS03: try number = 5, reading sector 8624
+RS03: try number = 6, reading sector 8722
+RS03: try number = 7, reading sector 8820
+RS03: try number = 8, reading sector 8918
+RS03: try number = 9, reading sector 9016
+RS03: try number = 10, reading sector 9114
+RS03: try number = 11, reading sector 9212
+RS03: try number = 12, reading sector 9310
+RS03: try number = 13, reading sector 9408
+RS03: try number = 14, reading sector 9506
+RS03: try number = 15, reading sector 9604
+RS03: try number = 16, reading sector 9702
+RS03: try number = 17, reading sector 9800
+RS03: try number = 18, reading sector 9898
+RS03: try number = 19, reading sector 9996
+RS03: try number = 20, reading sector 10094
+RS03: try number = 21, reading sector 10192
+RS03: try number = 22, reading sector 10290
+RS03: try number = 23, reading sector 10388
+RS03: try number = 24, reading sector 10486
+RS03: try number = 25, reading sector 10584
+RS03: try number = 26, reading sector 10682
+RS03: try number = 27, reading sector 10780
+RS03: try number = 28, reading sector 10878
+RS03: try number = 29, reading sector 10976
+RS03: try number = 30, reading sector 11074
+RS03: try number = 31, reading sector 11172
+RS03: try number = 32, reading sector 11270
+RS03: try number = 33, reading sector 11368
+RS03: try number = 34, reading sector 11466
+RS03: try number = 35, reading sector 11564
+RS03: try number = 36, reading sector 11662
+RS03: try number = 37, reading sector 11760
+RS03: try number = 38, reading sector 11858
+RS03: try number = 39, reading sector 11956
+RS03: try number = 40, reading sector 12054
+RS03: try number = 41, reading sector 12152
+RS03: try number = 42, reading sector 12250
+RS03: try number = 43, reading sector 12348
+RS03: try number = 44, reading sector 12446
+RS03: try number = 45, reading sector 12544
+RS03: try number = 46, reading sector 12642
+RS03: try number = 47, reading sector 12740
+RS03: try number = 48, reading sector 12838
+RS03: try number = 49, reading sector 12936
+RS03: try number = 50, reading sector 13034
+RS03: try number = 51, reading sector 13132
+RS03: try number = 52, reading sector 13230
+RS03: try number = 53, reading sector 13328
+RS03: try number = 54, reading sector 13426
+RS03: try number = 55, reading sector 13524
+RS03: try number = 56, reading sector 13622
+RS03: try number = 57, reading sector 13720
+RS03: try number = 58, reading sector 13818
+RS03: try number = 59, reading sector 13916
+RS03: try number = 60, reading sector 14014
+RS03: try number = 61, reading sector 14112
+RS03: try number = 62, reading sector 14210
+RS03: try number = 63, reading sector 14308
+RS03: try number = 64, reading sector 14406
+RS03: try number = 65, reading sector 14504
+RS03: try number = 66, reading sector 14602
+RS03: try number = 67, reading sector 14700
+RS03: try number = 68, reading sector 14798
+RS03: try number = 69, reading sector 14896
+RS03: try number = 70, reading sector 14994
+RS03: try number = 71, reading sector 15092
+RS03: try number = 72, reading sector 15190
+RS03: try number = 73, reading sector 15288
+RS03: try number = 74, reading sector 15386
+RS03: try number = 75, reading sector 15484
+RS03: try number = 76, reading sector 15582
+RS03: try number = 77, reading sector 15680
+RS03: try number = 78, reading sector 15778
+RS03: try number = 79, reading sector 15876
+RS03: try number = 80, reading sector 15974
+RS03: try number = 81, reading sector 16072
+RS03: try number = 82, reading sector 16170
+RS03: try number = 83, reading sector 16268
+RS03: try number = 84, reading sector 16366
+RS03: try number = 85, reading sector 16464
+RS03: try number = 86, reading sector 16562
+RS03: try number = 87, reading sector 16660
+RS03: try number = 88, reading sector 16758
+RS03: try number = 89, reading sector 16856
+RS03: try number = 90, reading sector 16954
+RS03: try number = 91, reading sector 17052
+RS03: try number = 92, reading sector 17150
+RS03: try number = 93, reading sector 17248
+RS03: try number = 94, reading sector 17346
+RS03: try number = 95, reading sector 17444
+RS03: try number = 96, reading sector 17542
+RS03: try number = 97, reading sector 17640
+RS03: try number = 98, reading sector 17738
+RS03: try number = 99, reading sector 17836
+RS03: try number = 100, reading sector 17934
+RS03: try number = 101, reading sector 18032
+RS03: try number = 102, reading sector 18130
+RS03: try number = 103, reading sector 18228
+RS03: try number = 104, reading sector 18326
+RS03: try number = 105, reading sector 18424
+RS03: try number = 106, reading sector 18522
+RS03: try number = 107, reading sector 18620
+RS03: try number = 108, reading sector 18718
+RS03: try number = 109, reading sector 18816
+RS03: try number = 110, reading sector 18914
+RS03: try number = 111, reading sector 19012
+RS03: try number = 112, reading sector 19110
+RS03: try number = 113, reading sector 19208
+RS03: try number = 114, reading sector 19306
+RS03: try number = 115, reading sector 19404
+RS03: try number = 116, reading sector 19502
+RS03: try number = 117, reading sector 19600
+RS03: try number = 118, reading sector 19698
+RS03: try number = 119, reading sector 19796
+RS03: try number = 120, reading sector 19894
+RS03: try number = 121, reading sector 19992
+RS03: try number = 122, reading sector 20090
+RS03: try number = 123, reading sector 20188
+RS03: try number = 124, reading sector 20286
+RS03: try number = 125, reading sector 20384
+RS03: try number = 126, reading sector 20482
+RS03: try number = 127, reading sector 20580
+RS03: try number = 128, reading sector 20678
+RS03: try number = 129, reading sector 20776
+RS03: try number = 130, reading sector 20874
+RS03: try number = 131, reading sector 20972
+RS03: try number = 132, reading sector 21070
 ** Success: sector 21070, rediscovered format with 39 roots
 ...augmented image found
 GetImageFingerprint(16): read & cached
--- a/regtest/database/RS03i_random_image
+++ b/regtest/database/RS03i_random_image
@@ -50,6 +50,7 @@ try_sector: trying sector 359295
 try_sector: read error, trying next header
 try_sector: trying sector 359145
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -139,6 +140,170 @@ RS03RecognizeImage: No EH, entering exhaustive search
 .. trying layer size 1409
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 118356
+RS03: try number = 2, reading sector 119765
+RS03: try number = 3, reading sector 121174
+RS03: try number = 4, reading sector 122583
+RS03: try number = 5, reading sector 123992
+RS03: try number = 6, reading sector 125401
+RS03: try number = 7, reading sector 126810
+RS03: try number = 8, reading sector 128219
+RS03: try number = 9, reading sector 129628
+RS03: try number = 10, reading sector 131037
+RS03: try number = 11, reading sector 132446
+RS03: try number = 12, reading sector 133855
+RS03: try number = 13, reading sector 135264
+RS03: try number = 14, reading sector 136673
+RS03: try number = 15, reading sector 138082
+RS03: try number = 16, reading sector 139491
+RS03: try number = 17, reading sector 140900
+RS03: try number = 18, reading sector 142309
+RS03: try number = 19, reading sector 143718
+RS03: try number = 20, reading sector 145127
+RS03: try number = 21, reading sector 146536
+RS03: try number = 22, reading sector 147945
+RS03: try number = 23, reading sector 149354
+RS03: try number = 24, reading sector 150763
+RS03: try number = 25, reading sector 152172
+RS03: try number = 26, reading sector 153581
+RS03: try number = 27, reading sector 154990
+RS03: try number = 28, reading sector 156399
+RS03: try number = 29, reading sector 157808
+RS03: try number = 30, reading sector 159217
+RS03: try number = 31, reading sector 160626
+RS03: try number = 32, reading sector 162035
+RS03: try number = 33, reading sector 163444
+RS03: try number = 34, reading sector 164853
+RS03: try number = 35, reading sector 166262
+RS03: try number = 36, reading sector 167671
+RS03: try number = 37, reading sector 169080
+RS03: try number = 38, reading sector 170489
+RS03: try number = 39, reading sector 171898
+RS03: try number = 40, reading sector 173307
+RS03: try number = 41, reading sector 174716
+RS03: try number = 42, reading sector 176125
+RS03: try number = 43, reading sector 177534
+RS03: try number = 44, reading sector 178943
+RS03: try number = 45, reading sector 180352
+RS03: try number = 46, reading sector 181761
+RS03: try number = 47, reading sector 183170
+RS03: try number = 48, reading sector 184579
+RS03: try number = 49, reading sector 185988
+RS03: try number = 50, reading sector 187397
+RS03: try number = 51, reading sector 188806
+RS03: try number = 52, reading sector 190215
+RS03: try number = 53, reading sector 191624
+RS03: try number = 54, reading sector 193033
+RS03: try number = 55, reading sector 194442
+RS03: try number = 56, reading sector 195851
+RS03: try number = 57, reading sector 197260
+RS03: try number = 58, reading sector 198669
+RS03: try number = 59, reading sector 200078
+RS03: try number = 60, reading sector 201487
+RS03: try number = 61, reading sector 202896
+RS03: try number = 62, reading sector 204305
+RS03: try number = 63, reading sector 205714
+RS03: try number = 64, reading sector 207123
+RS03: try number = 65, reading sector 208532
+RS03: try number = 66, reading sector 209941
+RS03: try number = 67, reading sector 211350
+RS03: try number = 68, reading sector 212759
+RS03: try number = 69, reading sector 214168
+RS03: try number = 70, reading sector 215577
+RS03: try number = 71, reading sector 216986
+RS03: try number = 72, reading sector 218395
+RS03: try number = 73, reading sector 219804
+RS03: try number = 74, reading sector 221213
+RS03: try number = 75, reading sector 222622
+RS03: try number = 76, reading sector 224031
+RS03: try number = 77, reading sector 225440
+RS03: try number = 78, reading sector 226849
+RS03: try number = 79, reading sector 228258
+RS03: try number = 80, reading sector 229667
+RS03: try number = 81, reading sector 231076
+RS03: try number = 82, reading sector 232485
+RS03: try number = 83, reading sector 233894
+RS03: try number = 84, reading sector 235303
+RS03: try number = 85, reading sector 236712
+RS03: try number = 86, reading sector 238121
+RS03: try number = 87, reading sector 239530
+RS03: try number = 88, reading sector 240939
+RS03: try number = 89, reading sector 242348
+RS03: try number = 90, reading sector 243757
+RS03: try number = 91, reading sector 245166
+RS03: try number = 92, reading sector 246575
+RS03: try number = 93, reading sector 247984
+RS03: try number = 94, reading sector 249393
+RS03: try number = 95, reading sector 250802
+RS03: try number = 96, reading sector 252211
+RS03: try number = 97, reading sector 253620
+RS03: try number = 98, reading sector 255029
+RS03: try number = 99, reading sector 256438
+RS03: try number = 100, reading sector 257847
+RS03: try number = 101, reading sector 259256
+RS03: try number = 102, reading sector 260665
+RS03: try number = 103, reading sector 262074
+RS03: try number = 104, reading sector 263483
+RS03: try number = 105, reading sector 264892
+RS03: try number = 106, reading sector 266301
+RS03: try number = 107, reading sector 267710
+RS03: try number = 108, reading sector 269119
+RS03: try number = 109, reading sector 270528
+RS03: try number = 110, reading sector 271937
+RS03: try number = 111, reading sector 273346
+RS03: try number = 112, reading sector 274755
+RS03: try number = 113, reading sector 276164
+RS03: try number = 114, reading sector 277573
+RS03: try number = 115, reading sector 278982
+RS03: try number = 116, reading sector 280391
+RS03: try number = 117, reading sector 281800
+RS03: try number = 118, reading sector 283209
+RS03: try number = 119, reading sector 284618
+RS03: try number = 120, reading sector 286027
+RS03: try number = 121, reading sector 287436
+RS03: try number = 122, reading sector 288845
+RS03: try number = 123, reading sector 290254
+RS03: try number = 124, reading sector 291663
+RS03: try number = 125, reading sector 293072
+RS03: try number = 126, reading sector 294481
+RS03: try number = 127, reading sector 295890
+RS03: try number = 128, reading sector 297299
+RS03: try number = 129, reading sector 298708
+RS03: try number = 130, reading sector 300117
+RS03: try number = 131, reading sector 301526
+RS03: try number = 132, reading sector 302935
+RS03: try number = 133, reading sector 304344
+RS03: try number = 134, reading sector 305753
+RS03: try number = 135, reading sector 307162
+RS03: try number = 136, reading sector 308571
+RS03: try number = 137, reading sector 309980
+RS03: try number = 138, reading sector 311389
+RS03: try number = 139, reading sector 312798
+RS03: try number = 140, reading sector 314207
+RS03: try number = 141, reading sector 315616
+RS03: try number = 142, reading sector 317025
+RS03: try number = 143, reading sector 318434
+RS03: try number = 144, reading sector 319843
+RS03: try number = 145, reading sector 321252
+RS03: try number = 146, reading sector 322661
+RS03: try number = 147, reading sector 324070
+RS03: try number = 148, reading sector 325479
+RS03: try number = 149, reading sector 326888
+RS03: try number = 150, reading sector 328297
+RS03: try number = 151, reading sector 329706
+RS03: try number = 152, reading sector 331115
+RS03: try number = 153, reading sector 332524
+RS03: try number = 154, reading sector 333933
+RS03: try number = 155, reading sector 335342
+RS03: try number = 156, reading sector 336751
+RS03: try number = 157, reading sector 338160
+RS03: try number = 158, reading sector 339569
+RS03: try number = 159, reading sector 340978
+RS03: try number = 160, reading sector 342387
+RS03: try number = 161, reading sector 343796
+RS03: try number = 162, reading sector 345205
+RS03: try number = 163, reading sector 346614
+RS03: try number = 164, reading sector 348023
 ** All layers tested -> no RS03 data found
 ...no augmented image detected.
 GetImageFingerprint(16): read & cached
--- a/regtest/database/RS03i_read_bad_header_exhaustive
+++ b/regtest/database/RS03i_read_bad_header_exhaustive
@@ -84,7 +84,73 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+try_sector: trying sector 24576
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 4096
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 256
+try_sector: trying sector 24832
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
@@ -93,6 +159,138 @@ Warning: image size set to 25000 for debugging!
 .. trying layer size 98
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 8232
+RS03: try number = 2, reading sector 8330
+RS03: try number = 3, reading sector 8428
+RS03: try number = 4, reading sector 8526
+RS03: try number = 5, reading sector 8624
+RS03: try number = 6, reading sector 8722
+RS03: try number = 7, reading sector 8820
+RS03: try number = 8, reading sector 8918
+RS03: try number = 9, reading sector 9016
+RS03: try number = 10, reading sector 9114
+RS03: try number = 11, reading sector 9212
+RS03: try number = 12, reading sector 9310
+RS03: try number = 13, reading sector 9408
+RS03: try number = 14, reading sector 9506
+RS03: try number = 15, reading sector 9604
+RS03: try number = 16, reading sector 9702
+RS03: try number = 17, reading sector 9800
+RS03: try number = 18, reading sector 9898
+RS03: try number = 19, reading sector 9996
+RS03: try number = 20, reading sector 10094
+RS03: try number = 21, reading sector 10192
+RS03: try number = 22, reading sector 10290
+RS03: try number = 23, reading sector 10388
+RS03: try number = 24, reading sector 10486
+RS03: try number = 25, reading sector 10584
+RS03: try number = 26, reading sector 10682
+RS03: try number = 27, reading sector 10780
+RS03: try number = 28, reading sector 10878
+RS03: try number = 29, reading sector 10976
+RS03: try number = 30, reading sector 11074
+RS03: try number = 31, reading sector 11172
+RS03: try number = 32, reading sector 11270
+RS03: try number = 33, reading sector 11368
+RS03: try number = 34, reading sector 11466
+RS03: try number = 35, reading sector 11564
+RS03: try number = 36, reading sector 11662
+RS03: try number = 37, reading sector 11760
+RS03: try number = 38, reading sector 11858
+RS03: try number = 39, reading sector 11956
+RS03: try number = 40, reading sector 12054
+RS03: try number = 41, reading sector 12152
+RS03: try number = 42, reading sector 12250
+RS03: try number = 43, reading sector 12348
+RS03: try number = 44, reading sector 12446
+RS03: try number = 45, reading sector 12544
+RS03: try number = 46, reading sector 12642
+RS03: try number = 47, reading sector 12740
+RS03: try number = 48, reading sector 12838
+RS03: try number = 49, reading sector 12936
+RS03: try number = 50, reading sector 13034
+RS03: try number = 51, reading sector 13132
+RS03: try number = 52, reading sector 13230
+RS03: try number = 53, reading sector 13328
+RS03: try number = 54, reading sector 13426
+RS03: try number = 55, reading sector 13524
+RS03: try number = 56, reading sector 13622
+RS03: try number = 57, reading sector 13720
+RS03: try number = 58, reading sector 13818
+RS03: try number = 59, reading sector 13916
+RS03: try number = 60, reading sector 14014
+RS03: try number = 61, reading sector 14112
+RS03: try number = 62, reading sector 14210
+RS03: try number = 63, reading sector 14308
+RS03: try number = 64, reading sector 14406
+RS03: try number = 65, reading sector 14504
+RS03: try number = 66, reading sector 14602
+RS03: try number = 67, reading sector 14700
+RS03: try number = 68, reading sector 14798
+RS03: try number = 69, reading sector 14896
+RS03: try number = 70, reading sector 14994
+RS03: try number = 71, reading sector 15092
+RS03: try number = 72, reading sector 15190
+RS03: try number = 73, reading sector 15288
+RS03: try number = 74, reading sector 15386
+RS03: try number = 75, reading sector 15484
+RS03: try number = 76, reading sector 15582
+RS03: try number = 77, reading sector 15680
+RS03: try number = 78, reading sector 15778
+RS03: try number = 79, reading sector 15876
+RS03: try number = 80, reading sector 15974
+RS03: try number = 81, reading sector 16072
+RS03: try number = 82, reading sector 16170
+RS03: try number = 83, reading sector 16268
+RS03: try number = 84, reading sector 16366
+RS03: try number = 85, reading sector 16464
+RS03: try number = 86, reading sector 16562
+RS03: try number = 87, reading sector 16660
+RS03: try number = 88, reading sector 16758
+RS03: try number = 89, reading sector 16856
+RS03: try number = 90, reading sector 16954
+RS03: try number = 91, reading sector 17052
+RS03: try number = 92, reading sector 17150
+RS03: try number = 93, reading sector 17248
+RS03: try number = 94, reading sector 17346
+RS03: try number = 95, reading sector 17444
+RS03: try number = 96, reading sector 17542
+RS03: try number = 97, reading sector 17640
+RS03: try number = 98, reading sector 17738
+RS03: try number = 99, reading sector 17836
+RS03: try number = 100, reading sector 17934
+RS03: try number = 101, reading sector 18032
+RS03: try number = 102, reading sector 18130
+RS03: try number = 103, reading sector 18228
+RS03: try number = 104, reading sector 18326
+RS03: try number = 105, reading sector 18424
+RS03: try number = 106, reading sector 18522
+RS03: try number = 107, reading sector 18620
+RS03: try number = 108, reading sector 18718
+RS03: try number = 109, reading sector 18816
+RS03: try number = 110, reading sector 18914
+RS03: try number = 111, reading sector 19012
+RS03: try number = 112, reading sector 19110
+RS03: try number = 113, reading sector 19208
+RS03: try number = 114, reading sector 19306
+RS03: try number = 115, reading sector 19404
+RS03: try number = 116, reading sector 19502
+RS03: try number = 117, reading sector 19600
+RS03: try number = 118, reading sector 19698
+RS03: try number = 119, reading sector 19796
+RS03: try number = 120, reading sector 19894
+RS03: try number = 121, reading sector 19992
+RS03: try number = 122, reading sector 20090
+RS03: try number = 123, reading sector 20188
+RS03: try number = 124, reading sector 20286
+RS03: try number = 125, reading sector 20384
+RS03: try number = 126, reading sector 20482
+RS03: try number = 127, reading sector 20580
+RS03: try number = 128, reading sector 20678
+RS03: try number = 129, reading sector 20776
+RS03: try number = 130, reading sector 20874
+RS03: try number = 131, reading sector 20972
+RS03: try number = 132, reading sector 21070
 ** Success: sector 21070, rediscovered format with 39 roots
 ...augmented image found
 # Calling query_size()
--- a/regtest/database/RS03i_read_bad_header_exhaustive.win
+++ b/regtest/database/RS03i_read_bad_header_exhaustive.win
@@ -0,0 +1,522 @@
+ca01afa400e2244fc4797cae542888d1
+ignore
+This software comes with  ABSOLUTELY NO WARRANTY.  This
+is free software and you are welcome to redistribute it
+under the conditions of the GNU GENERAL PUBLIC LICENSE.
+See the file "COPYING" for further information.
+# *** OpenImageFromDevice(sim-cd) ***
+# InquireDevice returned: Simulated CD drive 1.00
+
+Device: sim-cd, Simulated CD drive 1.00
+# *** query_type(Simulated CD drive 1.00, 0) ***
+# *** get_configuration(Simulated CD drive 1.00) ***
+# 8 data len, 9 current
+-> profile 9: CD-R
+# trying READ DISC INFORMATION for size
+# size returned is 32
+# trying READ DISC INFORMATION for real info
+0000: 00 20 1e 00 00 00 00 00  00 00 00 00 00 00 00 00  . ...... ........ 
+0010: 00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  ........ ........ 
+# status is 1e, disc type 0
+#CD: starting media probe
+#CD: querying size of READ TOC/PMA/ATIP (for TOC)
+#CD: size returned is 12
+#CD: querying real READ TOC/PMA/ATIP (for TOC)
+0000: 00 0a 00 00 00 14 00 00  00 00 00 00              ........ ....
+#CD: control is 0x14
+#CD: querying size of READ TOC/PMA/ATIP (for full TOC)
+# Warning: Realigning length from 26 to 24
+#CD: size returned is 24
+#CD: querying real READ TOC/PMA/ATIP (for full TOC)
+0000: 00 18 00 01 00 00 00 a0  00 00 00 00 00 00 00 00  ........ ........ 
+0010: 00 00 00 00 00 00 00 00                           ........ 
+#CD: 1 sessions
+#CD: CD medium detected, type: CD-R mode 1
+# query_type() returned.
+# deciding reading strategy...
+Using READ CD.
+GetImageFingerprint(16): read & cached
+
+ExamineUDF(Device: Simulated CD drive 1.00)
+ Examining the ISO file system...
+  Sector 16:
+   Volume descriptor type    = 1
+   Volume descriptor version = 1
+   Standard identifier       = CD001
+   -> primary volume descriptor:
+    System identifier         : |                                |
+    Volume identifier         : |RANDOM IMAGE                    |
+    Volume space size         : 21000 sectors
+    Volume set size           : 1
+    Volume sequence size      : 1
+    Logical block size        : 2048
+    Path table size           : 10 bytes
+    L-Path table location     : 19
+    Opt L-Path table location : 0
+    M-Path table location     : 20
+    Opt M-Path table location : 0
+    Volume creation date/time : 16-07-2006 10:35:46.23
+    Volume modification d/t   : 16-07-2006 10:35:46.23
+    Volume expiration d/t     : 16-07-2106 10:35:46.23
+    Volume effective d/t      : 16-07-2006 10:35:46.23
+    File structure version    : 1
+  Sector 17:
+   Volume descriptor type    = 2
+   Volume descriptor version = 1
+   Standard identifier       = CD001
+   -> supplementary volume descriptor: *skipped*
+  Sector 18:
+   Volume descriptor type    = 255
+   Volume descriptor version = 1
+   Standard identifier       = CD001
+   -> volume descriptor set terminator;
+      end of ISO file system parsing.
+ Examining the UDF file system...
+  not yet implemented.
+
+# *** read_capacity(Simulated CD drive 1.00) ***
+ -> 24989
+ExamineECC() started
+...trying RS01
+...trying RS02
+RS02Recognize: medium sim-cd
+try_sector: trying sector 21000
+try_sector: no cookie, skipping current modulo
+try_sector: trying sector 20850
+try_sector: no cookie, skipping current modulo
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+try_sector: trying sector 24576
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 4096
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 256
+try_sector: trying sector 24832
+try_sector: no cookie, skipping current modulo
+...trying RS03
+RS03RecognizeImage: medium sim-cd
+FindRS03HeaderInImage: medium sim-cd
+RS03RecognizeImage: No EH, entering exhaustive search
+Warning: image size set to 25000 for debugging!
+.. trying layer size 98
+Scanning layers for signatures.
+- layer slice 0
+RS03: try number = 1, reading sector 8232
+RS03: try number = 2, reading sector 8330
+RS03: try number = 3, reading sector 8428
+RS03: try number = 4, reading sector 8526
+RS03: try number = 5, reading sector 8624
+RS03: try number = 6, reading sector 8722
+RS03: try number = 7, reading sector 8820
+RS03: try number = 8, reading sector 8918
+RS03: try number = 9, reading sector 9016
+RS03: try number = 10, reading sector 9114
+RS03: try number = 11, reading sector 9212
+RS03: try number = 12, reading sector 9310
+RS03: try number = 13, reading sector 9408
+RS03: try number = 14, reading sector 9506
+RS03: try number = 15, reading sector 9604
+RS03: try number = 16, reading sector 9702
+RS03: try number = 17, reading sector 9800
+RS03: try number = 18, reading sector 9898
+RS03: try number = 19, reading sector 9996
+RS03: try number = 20, reading sector 10094
+RS03: try number = 21, reading sector 10192
+RS03: try number = 22, reading sector 10290
+RS03: try number = 23, reading sector 10388
+RS03: try number = 24, reading sector 10486
+RS03: try number = 25, reading sector 10584
+RS03: try number = 26, reading sector 10682
+RS03: try number = 27, reading sector 10780
+RS03: try number = 28, reading sector 10878
+RS03: try number = 29, reading sector 10976
+RS03: try number = 30, reading sector 11074
+RS03: try number = 31, reading sector 11172
+RS03: try number = 32, reading sector 11270
+RS03: try number = 33, reading sector 11368
+RS03: try number = 34, reading sector 11466
+RS03: try number = 35, reading sector 11564
+RS03: try number = 36, reading sector 11662
+RS03: try number = 37, reading sector 11760
+RS03: try number = 38, reading sector 11858
+RS03: try number = 39, reading sector 11956
+RS03: try number = 40, reading sector 12054
+RS03: try number = 41, reading sector 12152
+RS03: try number = 42, reading sector 12250
+RS03: try number = 43, reading sector 12348
+RS03: try number = 44, reading sector 12446
+RS03: try number = 45, reading sector 12544
+RS03: try number = 46, reading sector 12642
+RS03: try number = 47, reading sector 12740
+RS03: try number = 48, reading sector 12838
+RS03: try number = 49, reading sector 12936
+RS03: try number = 50, reading sector 13034
+RS03: try number = 51, reading sector 13132
+RS03: try number = 52, reading sector 13230
+RS03: try number = 53, reading sector 13328
+RS03: try number = 54, reading sector 13426
+RS03: try number = 55, reading sector 13524
+RS03: try number = 56, reading sector 13622
+RS03: try number = 57, reading sector 13720
+RS03: try number = 58, reading sector 13818
+RS03: try number = 59, reading sector 13916
+RS03: try number = 60, reading sector 14014
+RS03: try number = 61, reading sector 14112
+RS03: try number = 62, reading sector 14210
+RS03: try number = 63, reading sector 14308
+RS03: try number = 64, reading sector 14406
+RS03: try number = 65, reading sector 14504
+RS03: try number = 66, reading sector 14602
+RS03: try number = 67, reading sector 14700
+RS03: try number = 68, reading sector 14798
+RS03: try number = 69, reading sector 14896
+RS03: try number = 70, reading sector 14994
+RS03: try number = 71, reading sector 15092
+RS03: try number = 72, reading sector 15190
+RS03: try number = 73, reading sector 15288
+RS03: try number = 74, reading sector 15386
+RS03: try number = 75, reading sector 15484
+RS03: try number = 76, reading sector 15582
+RS03: try number = 77, reading sector 15680
+RS03: try number = 78, reading sector 15778
+RS03: try number = 79, reading sector 15876
+RS03: try number = 80, reading sector 15974
+RS03: try number = 81, reading sector 16072
+RS03: try number = 82, reading sector 16170
+RS03: try number = 83, reading sector 16268
+RS03: try number = 84, reading sector 16366
+RS03: try number = 85, reading sector 16464
+RS03: try number = 86, reading sector 16562
+RS03: try number = 87, reading sector 16660
+RS03: try number = 88, reading sector 16758
+RS03: try number = 89, reading sector 16856
+RS03: try number = 90, reading sector 16954
+RS03: try number = 91, reading sector 17052
+RS03: try number = 92, reading sector 17150
+RS03: try number = 93, reading sector 17248
+RS03: try number = 94, reading sector 17346
+RS03: try number = 95, reading sector 17444
+RS03: try number = 96, reading sector 17542
+RS03: try number = 97, reading sector 17640
+RS03: try number = 98, reading sector 17738
+RS03: try number = 99, reading sector 17836
+RS03: try number = 100, reading sector 17934
+RS03: try number = 101, reading sector 18032
+RS03: try number = 102, reading sector 18130
+RS03: try number = 103, reading sector 18228
+RS03: try number = 104, reading sector 18326
+RS03: try number = 105, reading sector 18424
+RS03: try number = 106, reading sector 18522
+RS03: try number = 107, reading sector 18620
+RS03: try number = 108, reading sector 18718
+RS03: try number = 109, reading sector 18816
+RS03: try number = 110, reading sector 18914
+RS03: try number = 111, reading sector 19012
+RS03: try number = 112, reading sector 19110
+RS03: try number = 113, reading sector 19208
+RS03: try number = 114, reading sector 19306
+RS03: try number = 115, reading sector 19404
+RS03: try number = 116, reading sector 19502
+RS03: try number = 117, reading sector 19600
+RS03: try number = 118, reading sector 19698
+RS03: try number = 119, reading sector 19796
+RS03: try number = 120, reading sector 19894
+RS03: try number = 121, reading sector 19992
+RS03: try number = 122, reading sector 20090
+RS03: try number = 123, reading sector 20188
+RS03: try number = 124, reading sector 20286
+RS03: try number = 125, reading sector 20384
+RS03: try number = 126, reading sector 20482
+RS03: try number = 127, reading sector 20580
+RS03: try number = 128, reading sector 20678
+RS03: try number = 129, reading sector 20776
+RS03: try number = 130, reading sector 20874
+RS03: try number = 131, reading sector 20972
+RS03: try number = 132, reading sector 21070
+** Success: sector 21070, rediscovered format with 39 roots
+...augmented image found
+# Calling query_size()
+# *** query_size(Simulated CD drive 1.00) ***
+Medium size obtained from ECC header: 24990 sectors
+# returned: 24990 sectors
+Medium "Random Image": CD-R mode 1, 24990 sectors, Ecc, created 16-07-2006.
+
+Creating new rs03i-tmp.iso image.
+Reading CRC information from ecc data (RS03) ... Calculated layout for RS03 image:
+data sectors      = 21000
+data padding      = 68
+layer size        = 98
+total sectors     = 24990
+medium capacity   = 0
+header position   = 21000
+first CRC sector  = 21070
+first ECC sector  = 21168
+ndata             = 216
+nroots            = 39 (18.1%)
+
+done.
+* CRC error, sector: 21000
+Current sector: 22032. This session: NewSectorsReadOK=22032, ReadErrors=0, CRCErrors=1
+Current sector: 22048. This session: NewSectorsReadOK=22048, ReadErrors=0, CRCErrors=1
+Current sector: 22064. This session: NewSectorsReadOK=22064, ReadErrors=0, CRCErrors=1
+Current sector: 22080. This session: NewSectorsReadOK=22080, ReadErrors=0, CRCErrors=1
+Current sector: 22096. This session: NewSectorsReadOK=22096, ReadErrors=0, CRCErrors=1
+Current sector: 22112. This session: NewSectorsReadOK=22112, ReadErrors=0, CRCErrors=1
+Current sector: 22128. This session: NewSectorsReadOK=22128, ReadErrors=0, CRCErrors=1
+Current sector: 22144. This session: NewSectorsReadOK=22144, ReadErrors=0, CRCErrors=1
+Current sector: 22160. This session: NewSectorsReadOK=22160, ReadErrors=0, CRCErrors=1
+Current sector: 22176. This session: NewSectorsReadOK=22176, ReadErrors=0, CRCErrors=1
+Current sector: 22192. This session: NewSectorsReadOK=22192, ReadErrors=0, CRCErrors=1
+Current sector: 22208. This session: NewSectorsReadOK=22208, ReadErrors=0, CRCErrors=1
+Current sector: 22224. This session: NewSectorsReadOK=22224, ReadErrors=0, CRCErrors=1
+Current sector: 22240. This session: NewSectorsReadOK=22240, ReadErrors=0, CRCErrors=1
+Current sector: 22256. This session: NewSectorsReadOK=22256, ReadErrors=0, CRCErrors=1
+Current sector: 22272. This session: NewSectorsReadOK=22272, ReadErrors=0, CRCErrors=1
+Current sector: 22288. This session: NewSectorsReadOK=22288, ReadErrors=0, CRCErrors=1
+Current sector: 22304. This session: NewSectorsReadOK=22304, ReadErrors=0, CRCErrors=1
+Current sector: 22320. This session: NewSectorsReadOK=22320, ReadErrors=0, CRCErrors=1
+Current sector: 22336. This session: NewSectorsReadOK=22336, ReadErrors=0, CRCErrors=1
+Current sector: 22352. This session: NewSectorsReadOK=22352, ReadErrors=0, CRCErrors=1
+Current sector: 22368. This session: NewSectorsReadOK=22368, ReadErrors=0, CRCErrors=1
+Current sector: 22384. This session: NewSectorsReadOK=22384, ReadErrors=0, CRCErrors=1
+Current sector: 22400. This session: NewSectorsReadOK=22400, ReadErrors=0, CRCErrors=1
+Current sector: 22416. This session: NewSectorsReadOK=22416, ReadErrors=0, CRCErrors=1
+Current sector: 22432. This session: NewSectorsReadOK=22432, ReadErrors=0, CRCErrors=1
+Current sector: 22448. This session: NewSectorsReadOK=22448, ReadErrors=0, CRCErrors=1
+Current sector: 22464. This session: NewSectorsReadOK=22464, ReadErrors=0, CRCErrors=1
+Current sector: 22480. This session: NewSectorsReadOK=22480, ReadErrors=0, CRCErrors=1
+Current sector: 22496. This session: NewSectorsReadOK=22496, ReadErrors=0, CRCErrors=1
+Current sector: 22512. This session: NewSectorsReadOK=22512, ReadErrors=0, CRCErrors=1
+Current sector: 22528. This session: NewSectorsReadOK=22528, ReadErrors=0, CRCErrors=1
+Current sector: 22544. This session: NewSectorsReadOK=22544, ReadErrors=0, CRCErrors=1
+Current sector: 22560. This session: NewSectorsReadOK=22560, ReadErrors=0, CRCErrors=1
+Current sector: 22576. This session: NewSectorsReadOK=22576, ReadErrors=0, CRCErrors=1
+Current sector: 22592. This session: NewSectorsReadOK=22592, ReadErrors=0, CRCErrors=1
+Current sector: 22608. This session: NewSectorsReadOK=22608, ReadErrors=0, CRCErrors=1
+Current sector: 22624. This session: NewSectorsReadOK=22624, ReadErrors=0, CRCErrors=1
+Current sector: 22640. This session: NewSectorsReadOK=22640, ReadErrors=0, CRCErrors=1
+Current sector: 22656. This session: NewSectorsReadOK=22656, ReadErrors=0, CRCErrors=1
+Current sector: 22672. This session: NewSectorsReadOK=22672, ReadErrors=0, CRCErrors=1
+Current sector: 22688. This session: NewSectorsReadOK=22688, ReadErrors=0, CRCErrors=1
+Current sector: 22704. This session: NewSectorsReadOK=22704, ReadErrors=0, CRCErrors=1
+Current sector: 22720. This session: NewSectorsReadOK=22720, ReadErrors=0, CRCErrors=1
+Current sector: 22736. This session: NewSectorsReadOK=22736, ReadErrors=0, CRCErrors=1
+Current sector: 22752. This session: NewSectorsReadOK=22752, ReadErrors=0, CRCErrors=1
+Current sector: 22768. This session: NewSectorsReadOK=22768, ReadErrors=0, CRCErrors=1
+Current sector: 22784. This session: NewSectorsReadOK=22784, ReadErrors=0, CRCErrors=1
+Current sector: 22800. This session: NewSectorsReadOK=22800, ReadErrors=0, CRCErrors=1
+Current sector: 22816. This session: NewSectorsReadOK=22816, ReadErrors=0, CRCErrors=1
+Current sector: 22832. This session: NewSectorsReadOK=22832, ReadErrors=0, CRCErrors=1
+Current sector: 22848. This session: NewSectorsReadOK=22848, ReadErrors=0, CRCErrors=1
+Current sector: 22864. This session: NewSectorsReadOK=22864, ReadErrors=0, CRCErrors=1
+Current sector: 22880. This session: NewSectorsReadOK=22880, ReadErrors=0, CRCErrors=1
+Current sector: 22896. This session: NewSectorsReadOK=22896, ReadErrors=0, CRCErrors=1
+Current sector: 22912. This session: NewSectorsReadOK=22912, ReadErrors=0, CRCErrors=1
+Current sector: 22928. This session: NewSectorsReadOK=22928, ReadErrors=0, CRCErrors=1
+Current sector: 22944. This session: NewSectorsReadOK=22944, ReadErrors=0, CRCErrors=1
+Current sector: 22960. This session: NewSectorsReadOK=22960, ReadErrors=0, CRCErrors=1
+Current sector: 22976. This session: NewSectorsReadOK=22976, ReadErrors=0, CRCErrors=1
+Current sector: 22992. This session: NewSectorsReadOK=22992, ReadErrors=0, CRCErrors=1
+Current sector: 23008. This session: NewSectorsReadOK=23008, ReadErrors=0, CRCErrors=1
+Current sector: 23024. This session: NewSectorsReadOK=23024, ReadErrors=0, CRCErrors=1
+Current sector: 23040. This session: NewSectorsReadOK=23040, ReadErrors=0, CRCErrors=1
+Current sector: 23056. This session: NewSectorsReadOK=23056, ReadErrors=0, CRCErrors=1
+Current sector: 23072. This session: NewSectorsReadOK=23072, ReadErrors=0, CRCErrors=1
+Current sector: 23088. This session: NewSectorsReadOK=23088, ReadErrors=0, CRCErrors=1
+Current sector: 23104. This session: NewSectorsReadOK=23104, ReadErrors=0, CRCErrors=1
+Current sector: 23120. This session: NewSectorsReadOK=23120, ReadErrors=0, CRCErrors=1
+Current sector: 23136. This session: NewSectorsReadOK=23136, ReadErrors=0, CRCErrors=1
+Current sector: 23152. This session: NewSectorsReadOK=23152, ReadErrors=0, CRCErrors=1
+Current sector: 23168. This session: NewSectorsReadOK=23168, ReadErrors=0, CRCErrors=1
+Current sector: 23184. This session: NewSectorsReadOK=23184, ReadErrors=0, CRCErrors=1
+Current sector: 23200. This session: NewSectorsReadOK=23200, ReadErrors=0, CRCErrors=1
+Current sector: 23216. This session: NewSectorsReadOK=23216, ReadErrors=0, CRCErrors=1
+Current sector: 23232. This session: NewSectorsReadOK=23232, ReadErrors=0, CRCErrors=1
+Current sector: 23248. This session: NewSectorsReadOK=23248, ReadErrors=0, CRCErrors=1
+Current sector: 23264. This session: NewSectorsReadOK=23264, ReadErrors=0, CRCErrors=1
+Current sector: 23280. This session: NewSectorsReadOK=23280, ReadErrors=0, CRCErrors=1
+Current sector: 23296. This session: NewSectorsReadOK=23296, ReadErrors=0, CRCErrors=1
+Current sector: 23312. This session: NewSectorsReadOK=23312, ReadErrors=0, CRCErrors=1
+Current sector: 23328. This session: NewSectorsReadOK=23328, ReadErrors=0, CRCErrors=1
+Current sector: 23344. This session: NewSectorsReadOK=23344, ReadErrors=0, CRCErrors=1
+Current sector: 23360. This session: NewSectorsReadOK=23360, ReadErrors=0, CRCErrors=1
+Current sector: 23376. This session: NewSectorsReadOK=23376, ReadErrors=0, CRCErrors=1
+Current sector: 23392. This session: NewSectorsReadOK=23392, ReadErrors=0, CRCErrors=1
+Current sector: 23408. This session: NewSectorsReadOK=23408, ReadErrors=0, CRCErrors=1
+Current sector: 23424. This session: NewSectorsReadOK=23424, ReadErrors=0, CRCErrors=1
+Current sector: 23440. This session: NewSectorsReadOK=23440, ReadErrors=0, CRCErrors=1
+Current sector: 23456. This session: NewSectorsReadOK=23456, ReadErrors=0, CRCErrors=1
+Current sector: 23472. This session: NewSectorsReadOK=23472, ReadErrors=0, CRCErrors=1
+Current sector: 23488. This session: NewSectorsReadOK=23488, ReadErrors=0, CRCErrors=1
+Current sector: 23504. This session: NewSectorsReadOK=23504, ReadErrors=0, CRCErrors=1
+Current sector: 23520. This session: NewSectorsReadOK=23520, ReadErrors=0, CRCErrors=1
+Current sector: 23536. This session: NewSectorsReadOK=23536, ReadErrors=0, CRCErrors=1
+Current sector: 23552. This session: NewSectorsReadOK=23552, ReadErrors=0, CRCErrors=1
+Current sector: 23568. This session: NewSectorsReadOK=23568, ReadErrors=0, CRCErrors=1
+Current sector: 23584. This session: NewSectorsReadOK=23584, ReadErrors=0, CRCErrors=1
+Current sector: 23600. This session: NewSectorsReadOK=23600, ReadErrors=0, CRCErrors=1
+Current sector: 23616. This session: NewSectorsReadOK=23616, ReadErrors=0, CRCErrors=1
+Current sector: 23632. This session: NewSectorsReadOK=23632, ReadErrors=0, CRCErrors=1
+Current sector: 23648. This session: NewSectorsReadOK=23648, ReadErrors=0, CRCErrors=1
+Current sector: 23664. This session: NewSectorsReadOK=23664, ReadErrors=0, CRCErrors=1
+Current sector: 23680. This session: NewSectorsReadOK=23680, ReadErrors=0, CRCErrors=1
+Current sector: 23696. This session: NewSectorsReadOK=23696, ReadErrors=0, CRCErrors=1
+Current sector: 23712. This session: NewSectorsReadOK=23712, ReadErrors=0, CRCErrors=1
+Current sector: 23728. This session: NewSectorsReadOK=23728, ReadErrors=0, CRCErrors=1
+Current sector: 23744. This session: NewSectorsReadOK=23744, ReadErrors=0, CRCErrors=1
+Current sector: 23760. This session: NewSectorsReadOK=23760, ReadErrors=0, CRCErrors=1
+Current sector: 23776. This session: NewSectorsReadOK=23776, ReadErrors=0, CRCErrors=1
+Current sector: 23792. This session: NewSectorsReadOK=23792, ReadErrors=0, CRCErrors=1
+Current sector: 23808. This session: NewSectorsReadOK=23808, ReadErrors=0, CRCErrors=1
+Current sector: 23824. This session: NewSectorsReadOK=23824, ReadErrors=0, CRCErrors=1
+Current sector: 23840. This session: NewSectorsReadOK=23840, ReadErrors=0, CRCErrors=1
+Current sector: 23856. This session: NewSectorsReadOK=23856, ReadErrors=0, CRCErrors=1
+Current sector: 23872. This session: NewSectorsReadOK=23872, ReadErrors=0, CRCErrors=1
+Current sector: 23888. This session: NewSectorsReadOK=23888, ReadErrors=0, CRCErrors=1
+Current sector: 23904. This session: NewSectorsReadOK=23904, ReadErrors=0, CRCErrors=1
+Current sector: 23920. This session: NewSectorsReadOK=23920, ReadErrors=0, CRCErrors=1
+Current sector: 23936. This session: NewSectorsReadOK=23936, ReadErrors=0, CRCErrors=1
+Current sector: 23952. This session: NewSectorsReadOK=23952, ReadErrors=0, CRCErrors=1
+Current sector: 23968. This session: NewSectorsReadOK=23968, ReadErrors=0, CRCErrors=1
+Current sector: 23984. This session: NewSectorsReadOK=23984, ReadErrors=0, CRCErrors=1
+Current sector: 24000. This session: NewSectorsReadOK=24000, ReadErrors=0, CRCErrors=1
+Current sector: 24016. This session: NewSectorsReadOK=24016, ReadErrors=0, CRCErrors=1
+Current sector: 24032. This session: NewSectorsReadOK=24032, ReadErrors=0, CRCErrors=1
+Current sector: 24048. This session: NewSectorsReadOK=24048, ReadErrors=0, CRCErrors=1
+Current sector: 24064. This session: NewSectorsReadOK=24064, ReadErrors=0, CRCErrors=1
+Current sector: 24080. This session: NewSectorsReadOK=24080, ReadErrors=0, CRCErrors=1
+Current sector: 24096. This session: NewSectorsReadOK=24096, ReadErrors=0, CRCErrors=1
+Current sector: 24112. This session: NewSectorsReadOK=24112, ReadErrors=0, CRCErrors=1
+Current sector: 24128. This session: NewSectorsReadOK=24128, ReadErrors=0, CRCErrors=1
+Current sector: 24144. This session: NewSectorsReadOK=24144, ReadErrors=0, CRCErrors=1
+Current sector: 24160. This session: NewSectorsReadOK=24160, ReadErrors=0, CRCErrors=1
+Current sector: 24176. This session: NewSectorsReadOK=24176, ReadErrors=0, CRCErrors=1
+Current sector: 24192. This session: NewSectorsReadOK=24192, ReadErrors=0, CRCErrors=1
+Current sector: 24208. This session: NewSectorsReadOK=24208, ReadErrors=0, CRCErrors=1
+Current sector: 24224. This session: NewSectorsReadOK=24224, ReadErrors=0, CRCErrors=1
+Current sector: 24240. This session: NewSectorsReadOK=24240, ReadErrors=0, CRCErrors=1
+Current sector: 24256. This session: NewSectorsReadOK=24256, ReadErrors=0, CRCErrors=1
+Current sector: 24272. This session: NewSectorsReadOK=24272, ReadErrors=0, CRCErrors=1
+Current sector: 24288. This session: NewSectorsReadOK=24288, ReadErrors=0, CRCErrors=1
+Current sector: 24304. This session: NewSectorsReadOK=24304, ReadErrors=0, CRCErrors=1
+Current sector: 24320. This session: NewSectorsReadOK=24320, ReadErrors=0, CRCErrors=1
+Current sector: 24336. This session: NewSectorsReadOK=24336, ReadErrors=0, CRCErrors=1
+Current sector: 24352. This session: NewSectorsReadOK=24352, ReadErrors=0, CRCErrors=1
+Current sector: 24368. This session: NewSectorsReadOK=24368, ReadErrors=0, CRCErrors=1
+Current sector: 24384. This session: NewSectorsReadOK=24384, ReadErrors=0, CRCErrors=1
+Current sector: 24400. This session: NewSectorsReadOK=24400, ReadErrors=0, CRCErrors=1
+Current sector: 24416. This session: NewSectorsReadOK=24416, ReadErrors=0, CRCErrors=1
+Current sector: 24432. This session: NewSectorsReadOK=24432, ReadErrors=0, CRCErrors=1
+Current sector: 24448. This session: NewSectorsReadOK=24448, ReadErrors=0, CRCErrors=1
+Current sector: 24464. This session: NewSectorsReadOK=24464, ReadErrors=0, CRCErrors=1
+Current sector: 24480. This session: NewSectorsReadOK=24480, ReadErrors=0, CRCErrors=1
+Current sector: 24496. This session: NewSectorsReadOK=24496, ReadErrors=0, CRCErrors=1
+Current sector: 24512. This session: NewSectorsReadOK=24512, ReadErrors=0, CRCErrors=1
+Current sector: 24528. This session: NewSectorsReadOK=24528, ReadErrors=0, CRCErrors=1
+Current sector: 24544. This session: NewSectorsReadOK=24544, ReadErrors=0, CRCErrors=1
+Current sector: 24560. This session: NewSectorsReadOK=24560, ReadErrors=0, CRCErrors=1
+Current sector: 24576. This session: NewSectorsReadOK=24576, ReadErrors=0, CRCErrors=1
+Current sector: 24592. This session: NewSectorsReadOK=24592, ReadErrors=0, CRCErrors=1
+Current sector: 24608. This session: NewSectorsReadOK=24608, ReadErrors=0, CRCErrors=1
+Current sector: 24624. This session: NewSectorsReadOK=24624, ReadErrors=0, CRCErrors=1
+Current sector: 24640. This session: NewSectorsReadOK=24640, ReadErrors=0, CRCErrors=1
+Current sector: 24656. This session: NewSectorsReadOK=24656, ReadErrors=0, CRCErrors=1
+Current sector: 24672. This session: NewSectorsReadOK=24672, ReadErrors=0, CRCErrors=1
+Current sector: 24688. This session: NewSectorsReadOK=24688, ReadErrors=0, CRCErrors=1
+Current sector: 24704. This session: NewSectorsReadOK=24704, ReadErrors=0, CRCErrors=1
+Current sector: 24720. This session: NewSectorsReadOK=24720, ReadErrors=0, CRCErrors=1
+Current sector: 24736. This session: NewSectorsReadOK=24736, ReadErrors=0, CRCErrors=1
+Current sector: 24752. This session: NewSectorsReadOK=24752, ReadErrors=0, CRCErrors=1
+Current sector: 24768. This session: NewSectorsReadOK=24768, ReadErrors=0, CRCErrors=1
+Current sector: 24784. This session: NewSectorsReadOK=24784, ReadErrors=0, CRCErrors=1
+Current sector: 24800. This session: NewSectorsReadOK=24800, ReadErrors=0, CRCErrors=1
+Current sector: 24816. This session: NewSectorsReadOK=24816, ReadErrors=0, CRCErrors=1
+Current sector: 24832. This session: NewSectorsReadOK=24832, ReadErrors=0, CRCErrors=1
+Current sector: 24848. This session: NewSectorsReadOK=24848, ReadErrors=0, CRCErrors=1
+Current sector: 24864. This session: NewSectorsReadOK=24864, ReadErrors=0, CRCErrors=1
+Current sector: 24880. This session: NewSectorsReadOK=24880, ReadErrors=0, CRCErrors=1
+Current sector: 24896. This session: NewSectorsReadOK=24896, ReadErrors=0, CRCErrors=1
+Current sector: 24912. This session: NewSectorsReadOK=24912, ReadErrors=0, CRCErrors=1
+Current sector: 24928. This session: NewSectorsReadOK=24928, ReadErrors=0, CRCErrors=1
+Current sector: 24944. This session: NewSectorsReadOK=24944, ReadErrors=0, CRCErrors=1
+Current sector: 24960. This session: NewSectorsReadOK=24960, ReadErrors=0, CRCErrors=1
+Current sector: 24976. This session: NewSectorsReadOK=24976, ReadErrors=0, CRCErrors=1
+Current sector: 24977. This session: NewSectorsReadOK=24977, ReadErrors=0, CRCErrors=1
+Current sector: 24978. This session: NewSectorsReadOK=24978, ReadErrors=0, CRCErrors=1
+Current sector: 24979. This session: NewSectorsReadOK=24979, ReadErrors=0, CRCErrors=1
+Current sector: 24980. This session: NewSectorsReadOK=24980, ReadErrors=0, CRCErrors=1
+Current sector: 24981. This session: NewSectorsReadOK=24981, ReadErrors=0, CRCErrors=1
+Current sector: 24982. This session: NewSectorsReadOK=24982, ReadErrors=0, CRCErrors=1
+Current sector: 24983. This session: NewSectorsReadOK=24983, ReadErrors=0, CRCErrors=1
+Current sector: 24984. This session: NewSectorsReadOK=24984, ReadErrors=0, CRCErrors=1
+Current sector: 24985. This session: NewSectorsReadOK=24985, ReadErrors=0, CRCErrors=1
+Current sector: 24986. This session: NewSectorsReadOK=24986, ReadErrors=0, CRCErrors=1
+Current sector: 24987. This session: NewSectorsReadOK=24987, ReadErrors=0, CRCErrors=1
+Current sector: 24988. This session: NewSectorsReadOK=24988, ReadErrors=0, CRCErrors=1
+Current sector: 24989. This session: NewSectorsReadOK=24989, ReadErrors=0, CRCErrors=1
+Current sector: 24990. This session: NewSectorsReadOK=24990, ReadErrors=0, CRCErrors=1
+
+1 CRC errors.
+CrcBuf contents, image path none (medium):
+  crcSize: 24990, dataSectors: 21000, coveredSectors: 21070, allSectors: 24990
+  md5State: invalid
+  fp sector: 16; 15c0fd35a0cfa0f83b9ccbd8604c2592
+  missing crcs: 0
--- a/regtest/database/RS03i_read_good_verbose
+++ b/regtest/database/RS03i_read_good_verbose
@@ -84,7 +84,73 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+try_sector: trying sector 24576
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 4096
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 256
+try_sector: trying sector 24832
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
--- a/regtest/database/RS03i_read_longer
+++ b/regtest/database/RS03i_read_longer
@@ -84,7 +84,73 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+try_sector: trying sector 24576
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 4096
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 256
+try_sector: trying sector 24832
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
--- a/regtest/database/RS03i_read_missing_iso_header
+++ b/regtest/database/RS03i_read_missing_iso_header
--- a/regtest/database/RS03i_read_with_ecc_file_crc_block
+++ b/regtest/database/RS03i_read_with_ecc_file_crc_block
@@ -84,7 +84,73 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+try_sector: trying sector 24576
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 4096
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 256
+try_sector: trying sector 24832
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
@@ -93,9 +159,174 @@ Warning: image size set to 25000 for debugging!
 .. trying layer size 98
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 8232
+RS03: try number = 2, reading sector 8330
+RS03: try number = 3, reading sector 8428
+RS03: try number = 4, reading sector 8526
+RS03: try number = 5, reading sector 8624
+RS03: try number = 6, reading sector 8722
+RS03: try number = 7, reading sector 8820
+RS03: try number = 8, reading sector 8918
+RS03: try number = 9, reading sector 9016
+RS03: try number = 10, reading sector 9114
+RS03: try number = 11, reading sector 9212
+RS03: try number = 12, reading sector 9310
+RS03: try number = 13, reading sector 9408
+RS03: try number = 14, reading sector 9506
+RS03: try number = 15, reading sector 9604
+RS03: try number = 16, reading sector 9702
+RS03: try number = 17, reading sector 9800
+RS03: try number = 18, reading sector 9898
+RS03: try number = 19, reading sector 9996
+RS03: try number = 20, reading sector 10094
+RS03: try number = 21, reading sector 10192
+RS03: try number = 22, reading sector 10290
+RS03: try number = 23, reading sector 10388
+RS03: try number = 24, reading sector 10486
+RS03: try number = 25, reading sector 10584
+RS03: try number = 26, reading sector 10682
+RS03: try number = 27, reading sector 10780
+RS03: try number = 28, reading sector 10878
+RS03: try number = 29, reading sector 10976
+RS03: try number = 30, reading sector 11074
+RS03: try number = 31, reading sector 11172
+RS03: try number = 32, reading sector 11270
+RS03: try number = 33, reading sector 11368
+RS03: try number = 34, reading sector 11466
+RS03: try number = 35, reading sector 11564
+RS03: try number = 36, reading sector 11662
+RS03: try number = 37, reading sector 11760
+RS03: try number = 38, reading sector 11858
+RS03: try number = 39, reading sector 11956
+RS03: try number = 40, reading sector 12054
+RS03: try number = 41, reading sector 12152
+RS03: try number = 42, reading sector 12250
+RS03: try number = 43, reading sector 12348
+RS03: try number = 44, reading sector 12446
+RS03: try number = 45, reading sector 12544
+RS03: try number = 46, reading sector 12642
+RS03: try number = 47, reading sector 12740
+RS03: try number = 48, reading sector 12838
+RS03: try number = 49, reading sector 12936
+RS03: try number = 50, reading sector 13034
+RS03: try number = 51, reading sector 13132
+RS03: try number = 52, reading sector 13230
+RS03: try number = 53, reading sector 13328
+RS03: try number = 54, reading sector 13426
+RS03: try number = 55, reading sector 13524
+RS03: try number = 56, reading sector 13622
+RS03: try number = 57, reading sector 13720
+RS03: try number = 58, reading sector 13818
+RS03: try number = 59, reading sector 13916
+RS03: try number = 60, reading sector 14014
+RS03: try number = 61, reading sector 14112
+RS03: try number = 62, reading sector 14210
+RS03: try number = 63, reading sector 14308
+RS03: try number = 64, reading sector 14406
+RS03: try number = 65, reading sector 14504
+RS03: try number = 66, reading sector 14602
+RS03: try number = 67, reading sector 14700
+RS03: try number = 68, reading sector 14798
+RS03: try number = 69, reading sector 14896
+RS03: try number = 70, reading sector 14994
+RS03: try number = 71, reading sector 15092
+RS03: try number = 72, reading sector 15190
+RS03: try number = 73, reading sector 15288
+RS03: try number = 74, reading sector 15386
+RS03: try number = 75, reading sector 15484
+RS03: try number = 76, reading sector 15582
+RS03: try number = 77, reading sector 15680
+RS03: try number = 78, reading sector 15778
+RS03: try number = 79, reading sector 15876
+RS03: try number = 80, reading sector 15974
+RS03: try number = 81, reading sector 16072
+RS03: try number = 82, reading sector 16170
+RS03: try number = 83, reading sector 16268
+RS03: try number = 84, reading sector 16366
+RS03: try number = 85, reading sector 16464
+RS03: try number = 86, reading sector 16562
+RS03: try number = 87, reading sector 16660
+RS03: try number = 88, reading sector 16758
+RS03: try number = 89, reading sector 16856
+RS03: try number = 90, reading sector 16954
+RS03: try number = 91, reading sector 17052
+RS03: try number = 92, reading sector 17150
+RS03: try number = 93, reading sector 17248
+RS03: try number = 94, reading sector 17346
+RS03: try number = 95, reading sector 17444
+RS03: try number = 96, reading sector 17542
+RS03: try number = 97, reading sector 17640
+RS03: try number = 98, reading sector 17738
+RS03: try number = 99, reading sector 17836
+RS03: try number = 100, reading sector 17934
+RS03: try number = 101, reading sector 18032
+RS03: try number = 102, reading sector 18130
+RS03: try number = 103, reading sector 18228
+RS03: try number = 104, reading sector 18326
+RS03: try number = 105, reading sector 18424
+RS03: try number = 106, reading sector 18522
+RS03: try number = 107, reading sector 18620
+RS03: try number = 108, reading sector 18718
+RS03: try number = 109, reading sector 18816
+RS03: try number = 110, reading sector 18914
+RS03: try number = 111, reading sector 19012
+RS03: try number = 112, reading sector 19110
+RS03: try number = 113, reading sector 19208
+RS03: try number = 114, reading sector 19306
+RS03: try number = 115, reading sector 19404
+RS03: try number = 116, reading sector 19502
+RS03: try number = 117, reading sector 19600
+RS03: try number = 118, reading sector 19698
+RS03: try number = 119, reading sector 19796
+RS03: try number = 120, reading sector 19894
+RS03: try number = 121, reading sector 19992
+RS03: try number = 122, reading sector 20090
+RS03: try number = 123, reading sector 20188
+RS03: try number = 124, reading sector 20286
+RS03: try number = 125, reading sector 20384
+RS03: try number = 126, reading sector 20482
+RS03: try number = 127, reading sector 20580
+RS03: try number = 128, reading sector 20678
+RS03: try number = 129, reading sector 20776
+RS03: try number = 130, reading sector 20874
+RS03: try number = 131, reading sector 20972
+RS03: try number = 132, reading sector 21070
 .. Crc block from ecc file in image - IGNORED
+RS03: try number = 133, reading sector 21168
+RS03: try number = 134, reading sector 21266
+RS03: try number = 135, reading sector 21364
+RS03: try number = 136, reading sector 21462
+RS03: try number = 137, reading sector 21560
+RS03: try number = 138, reading sector 21658
+RS03: try number = 139, reading sector 21756
+RS03: try number = 140, reading sector 21854
+RS03: try number = 141, reading sector 21952
+RS03: try number = 142, reading sector 22050
+RS03: try number = 143, reading sector 22148
+RS03: try number = 144, reading sector 22246
+RS03: try number = 145, reading sector 22344
+RS03: try number = 146, reading sector 22442
+RS03: try number = 147, reading sector 22540
+RS03: try number = 148, reading sector 22638
+RS03: try number = 149, reading sector 22736
+RS03: try number = 150, reading sector 22834
+RS03: try number = 151, reading sector 22932
+RS03: try number = 152, reading sector 23030
+RS03: try number = 153, reading sector 23128
+RS03: try number = 154, reading sector 23226
+RS03: try number = 155, reading sector 23324
+RS03: try number = 156, reading sector 23422
+RS03: try number = 157, reading sector 23520
+RS03: try number = 158, reading sector 23618
+RS03: try number = 159, reading sector 23716
+RS03: try number = 160, reading sector 23814
+RS03: try number = 161, reading sector 23912
+RS03: try number = 162, reading sector 24010
+RS03: try number = 163, reading sector 24108
+RS03: try number = 164, reading sector 24206
 -> 1 untested layers remaining
 - layer slice 1
+RS03: try number = 165, reading sector 21071
 ** Success: sector 21071, rediscovered format with 39 roots
 ...augmented image found
 # Calling query_size()
@@ -120,6 +351,285 @@ nroots            = 39 (18.1%)
 done.
 Sector 20992, try 1: Medium Error; Unrecovered read error.
 Sector 20992: Medium Error; Unrecovered read error. Skipping 15 sectors.
+Current sector: 20993. This session: NewSectorsReadOK=20992, ReadErrors=1
+Current sector: 20994. This session: NewSectorsReadOK=20992, ReadErrors=2
+Current sector: 20995. This session: NewSectorsReadOK=20992, ReadErrors=3
+Current sector: 20996. This session: NewSectorsReadOK=20992, ReadErrors=4
+Current sector: 20997. This session: NewSectorsReadOK=20992, ReadErrors=5
+Current sector: 20998. This session: NewSectorsReadOK=20992, ReadErrors=6
+Current sector: 20999. This session: NewSectorsReadOK=20992, ReadErrors=7
+Current sector: 21000. This session: NewSectorsReadOK=20992, ReadErrors=8
+Current sector: 21001. This session: NewSectorsReadOK=20992, ReadErrors=9
+Current sector: 21002. This session: NewSectorsReadOK=20992, ReadErrors=10
+Current sector: 21003. This session: NewSectorsReadOK=20992, ReadErrors=11
+Current sector: 21004. This session: NewSectorsReadOK=20992, ReadErrors=12
+Current sector: 21005. This session: NewSectorsReadOK=20992, ReadErrors=13
+Current sector: 21006. This session: NewSectorsReadOK=20992, ReadErrors=14
+Current sector: 21007. This session: NewSectorsReadOK=20992, ReadErrors=15
+Current sector: 21008. This session: NewSectorsReadOK=20992, ReadErrors=16
+Current sector: 21008. This session: NewSectorsReadOK=20992, ReadErrors=16
+Current sector: 21024. This session: NewSectorsReadOK=21008, ReadErrors=16
+Current sector: 21040. This session: NewSectorsReadOK=21024, ReadErrors=16
+Current sector: 21056. This session: NewSectorsReadOK=21040, ReadErrors=16
+Current sector: 21072. This session: NewSectorsReadOK=21056, ReadErrors=16
+Current sector: 21088. This session: NewSectorsReadOK=21072, ReadErrors=16
+Current sector: 21104. This session: NewSectorsReadOK=21088, ReadErrors=16
+Current sector: 21120. This session: NewSectorsReadOK=21104, ReadErrors=16
+Current sector: 21136. This session: NewSectorsReadOK=21120, ReadErrors=16
+Current sector: 21152. This session: NewSectorsReadOK=21136, ReadErrors=16
+Current sector: 21168. This session: NewSectorsReadOK=21152, ReadErrors=16
+Current sector: 21184. This session: NewSectorsReadOK=21168, ReadErrors=16
+Current sector: 21200. This session: NewSectorsReadOK=21184, ReadErrors=16
+Current sector: 21216. This session: NewSectorsReadOK=21200, ReadErrors=16
+Current sector: 21232. This session: NewSectorsReadOK=21216, ReadErrors=16
+Current sector: 21248. This session: NewSectorsReadOK=21232, ReadErrors=16
+Current sector: 21264. This session: NewSectorsReadOK=21248, ReadErrors=16
+Current sector: 21280. This session: NewSectorsReadOK=21264, ReadErrors=16
+Current sector: 21296. This session: NewSectorsReadOK=21280, ReadErrors=16
+Current sector: 21312. This session: NewSectorsReadOK=21296, ReadErrors=16
+Current sector: 21328. This session: NewSectorsReadOK=21312, ReadErrors=16
+Current sector: 21344. This session: NewSectorsReadOK=21328, ReadErrors=16
+Current sector: 21360. This session: NewSectorsReadOK=21344, ReadErrors=16
+Current sector: 21376. This session: NewSectorsReadOK=21360, ReadErrors=16
+Current sector: 21392. This session: NewSectorsReadOK=21376, ReadErrors=16
+Current sector: 21408. This session: NewSectorsReadOK=21392, ReadErrors=16
+Current sector: 21424. This session: NewSectorsReadOK=21408, ReadErrors=16
+Current sector: 21440. This session: NewSectorsReadOK=21424, ReadErrors=16
+Current sector: 21456. This session: NewSectorsReadOK=21440, ReadErrors=16
+Current sector: 21472. This session: NewSectorsReadOK=21456, ReadErrors=16
+Current sector: 21488. This session: NewSectorsReadOK=21472, ReadErrors=16
+Current sector: 21504. This session: NewSectorsReadOK=21488, ReadErrors=16
+Current sector: 21520. This session: NewSectorsReadOK=21504, ReadErrors=16
+Current sector: 21536. This session: NewSectorsReadOK=21520, ReadErrors=16
+Current sector: 21552. This session: NewSectorsReadOK=21536, ReadErrors=16
+Current sector: 21568. This session: NewSectorsReadOK=21552, ReadErrors=16
+Current sector: 21584. This session: NewSectorsReadOK=21568, ReadErrors=16
+Current sector: 21600. This session: NewSectorsReadOK=21584, ReadErrors=16
+Current sector: 21616. This session: NewSectorsReadOK=21600, ReadErrors=16
+Current sector: 21632. This session: NewSectorsReadOK=21616, ReadErrors=16
+Current sector: 21648. This session: NewSectorsReadOK=21632, ReadErrors=16
+Current sector: 21664. This session: NewSectorsReadOK=21648, ReadErrors=16
+Current sector: 21680. This session: NewSectorsReadOK=21664, ReadErrors=16
+Current sector: 21696. This session: NewSectorsReadOK=21680, ReadErrors=16
+Current sector: 21712. This session: NewSectorsReadOK=21696, ReadErrors=16
+Current sector: 21728. This session: NewSectorsReadOK=21712, ReadErrors=16
+Current sector: 21744. This session: NewSectorsReadOK=21728, ReadErrors=16
+Current sector: 21760. This session: NewSectorsReadOK=21744, ReadErrors=16
+Current sector: 21776. This session: NewSectorsReadOK=21760, ReadErrors=16
+Current sector: 21792. This session: NewSectorsReadOK=21776, ReadErrors=16
+Current sector: 21808. This session: NewSectorsReadOK=21792, ReadErrors=16
+Current sector: 21824. This session: NewSectorsReadOK=21808, ReadErrors=16
+Current sector: 21840. This session: NewSectorsReadOK=21824, ReadErrors=16
+Current sector: 21856. This session: NewSectorsReadOK=21840, ReadErrors=16
+Current sector: 21872. This session: NewSectorsReadOK=21856, ReadErrors=16
+Current sector: 21888. This session: NewSectorsReadOK=21872, ReadErrors=16
+Current sector: 21904. This session: NewSectorsReadOK=21888, ReadErrors=16
+Current sector: 21920. This session: NewSectorsReadOK=21904, ReadErrors=16
+Current sector: 21936. This session: NewSectorsReadOK=21920, ReadErrors=16
+Current sector: 21952. This session: NewSectorsReadOK=21936, ReadErrors=16
+Current sector: 21968. This session: NewSectorsReadOK=21952, ReadErrors=16
+Current sector: 21984. This session: NewSectorsReadOK=21968, ReadErrors=16
+Current sector: 22000. This session: NewSectorsReadOK=21984, ReadErrors=16
+Current sector: 22016. This session: NewSectorsReadOK=22000, ReadErrors=16
+Current sector: 22032. This session: NewSectorsReadOK=22016, ReadErrors=16
+Current sector: 22048. This session: NewSectorsReadOK=22032, ReadErrors=16
+Current sector: 22064. This session: NewSectorsReadOK=22048, ReadErrors=16
+Current sector: 22080. This session: NewSectorsReadOK=22064, ReadErrors=16
+Current sector: 22096. This session: NewSectorsReadOK=22080, ReadErrors=16
+Current sector: 22112. This session: NewSectorsReadOK=22096, ReadErrors=16
+Current sector: 22128. This session: NewSectorsReadOK=22112, ReadErrors=16
+Current sector: 22144. This session: NewSectorsReadOK=22128, ReadErrors=16
+Current sector: 22160. This session: NewSectorsReadOK=22144, ReadErrors=16
+Current sector: 22176. This session: NewSectorsReadOK=22160, ReadErrors=16
+Current sector: 22192. This session: NewSectorsReadOK=22176, ReadErrors=16
+Current sector: 22208. This session: NewSectorsReadOK=22192, ReadErrors=16
+Current sector: 22224. This session: NewSectorsReadOK=22208, ReadErrors=16
+Current sector: 22240. This session: NewSectorsReadOK=22224, ReadErrors=16
+Current sector: 22256. This session: NewSectorsReadOK=22240, ReadErrors=16
+Current sector: 22272. This session: NewSectorsReadOK=22256, ReadErrors=16
+Current sector: 22288. This session: NewSectorsReadOK=22272, ReadErrors=16
+Current sector: 22304. This session: NewSectorsReadOK=22288, ReadErrors=16
+Current sector: 22320. This session: NewSectorsReadOK=22304, ReadErrors=16
+Current sector: 22336. This session: NewSectorsReadOK=22320, ReadErrors=16
+Current sector: 22352. This session: NewSectorsReadOK=22336, ReadErrors=16
+Current sector: 22368. This session: NewSectorsReadOK=22352, ReadErrors=16
+Current sector: 22384. This session: NewSectorsReadOK=22368, ReadErrors=16
+Current sector: 22400. This session: NewSectorsReadOK=22384, ReadErrors=16
+Current sector: 22416. This session: NewSectorsReadOK=22400, ReadErrors=16
+Current sector: 22432. This session: NewSectorsReadOK=22416, ReadErrors=16
+Current sector: 22448. This session: NewSectorsReadOK=22432, ReadErrors=16
+Current sector: 22464. This session: NewSectorsReadOK=22448, ReadErrors=16
+Current sector: 22480. This session: NewSectorsReadOK=22464, ReadErrors=16
+Current sector: 22496. This session: NewSectorsReadOK=22480, ReadErrors=16
+Current sector: 22512. This session: NewSectorsReadOK=22496, ReadErrors=16
+Current sector: 22528. This session: NewSectorsReadOK=22512, ReadErrors=16
+Current sector: 22544. This session: NewSectorsReadOK=22528, ReadErrors=16
+Current sector: 22560. This session: NewSectorsReadOK=22544, ReadErrors=16
+Current sector: 22576. This session: NewSectorsReadOK=22560, ReadErrors=16
+Current sector: 22592. This session: NewSectorsReadOK=22576, ReadErrors=16
+Current sector: 22608. This session: NewSectorsReadOK=22592, ReadErrors=16
+Current sector: 22624. This session: NewSectorsReadOK=22608, ReadErrors=16
+Current sector: 22640. This session: NewSectorsReadOK=22624, ReadErrors=16
+Current sector: 22656. This session: NewSectorsReadOK=22640, ReadErrors=16
+Current sector: 22672. This session: NewSectorsReadOK=22656, ReadErrors=16
+Current sector: 22688. This session: NewSectorsReadOK=22672, ReadErrors=16
+Current sector: 22704. This session: NewSectorsReadOK=22688, ReadErrors=16
+Current sector: 22720. This session: NewSectorsReadOK=22704, ReadErrors=16
+Current sector: 22736. This session: NewSectorsReadOK=22720, ReadErrors=16
+Current sector: 22752. This session: NewSectorsReadOK=22736, ReadErrors=16
+Current sector: 22768. This session: NewSectorsReadOK=22752, ReadErrors=16
+Current sector: 22784. This session: NewSectorsReadOK=22768, ReadErrors=16
+Current sector: 22800. This session: NewSectorsReadOK=22784, ReadErrors=16
+Current sector: 22816. This session: NewSectorsReadOK=22800, ReadErrors=16
+Current sector: 22832. This session: NewSectorsReadOK=22816, ReadErrors=16
+Current sector: 22848. This session: NewSectorsReadOK=22832, ReadErrors=16
+Current sector: 22864. This session: NewSectorsReadOK=22848, ReadErrors=16
+Current sector: 22880. This session: NewSectorsReadOK=22864, ReadErrors=16
+Current sector: 22896. This session: NewSectorsReadOK=22880, ReadErrors=16
+Current sector: 22912. This session: NewSectorsReadOK=22896, ReadErrors=16
+Current sector: 22928. This session: NewSectorsReadOK=22912, ReadErrors=16
+Current sector: 22944. This session: NewSectorsReadOK=22928, ReadErrors=16
+Current sector: 22960. This session: NewSectorsReadOK=22944, ReadErrors=16
+Current sector: 22976. This session: NewSectorsReadOK=22960, ReadErrors=16
+Current sector: 22992. This session: NewSectorsReadOK=22976, ReadErrors=16
+Current sector: 23008. This session: NewSectorsReadOK=22992, ReadErrors=16
+Current sector: 23024. This session: NewSectorsReadOK=23008, ReadErrors=16
+Current sector: 23040. This session: NewSectorsReadOK=23024, ReadErrors=16
+Current sector: 23056. This session: NewSectorsReadOK=23040, ReadErrors=16
+Current sector: 23072. This session: NewSectorsReadOK=23056, ReadErrors=16
+Current sector: 23088. This session: NewSectorsReadOK=23072, ReadErrors=16
+Current sector: 23104. This session: NewSectorsReadOK=23088, ReadErrors=16
+Current sector: 23120. This session: NewSectorsReadOK=23104, ReadErrors=16
+Current sector: 23136. This session: NewSectorsReadOK=23120, ReadErrors=16
+Current sector: 23152. This session: NewSectorsReadOK=23136, ReadErrors=16
+Current sector: 23168. This session: NewSectorsReadOK=23152, ReadErrors=16
+Current sector: 23184. This session: NewSectorsReadOK=23168, ReadErrors=16
+Current sector: 23200. This session: NewSectorsReadOK=23184, ReadErrors=16
+Current sector: 23216. This session: NewSectorsReadOK=23200, ReadErrors=16
+Current sector: 23232. This session: NewSectorsReadOK=23216, ReadErrors=16
+Current sector: 23248. This session: NewSectorsReadOK=23232, ReadErrors=16
+Current sector: 23264. This session: NewSectorsReadOK=23248, ReadErrors=16
+Current sector: 23280. This session: NewSectorsReadOK=23264, ReadErrors=16
+Current sector: 23296. This session: NewSectorsReadOK=23280, ReadErrors=16
+Current sector: 23312. This session: NewSectorsReadOK=23296, ReadErrors=16
+Current sector: 23328. This session: NewSectorsReadOK=23312, ReadErrors=16
+Current sector: 23344. This session: NewSectorsReadOK=23328, ReadErrors=16
+Current sector: 23360. This session: NewSectorsReadOK=23344, ReadErrors=16
+Current sector: 23376. This session: NewSectorsReadOK=23360, ReadErrors=16
+Current sector: 23392. This session: NewSectorsReadOK=23376, ReadErrors=16
+Current sector: 23408. This session: NewSectorsReadOK=23392, ReadErrors=16
+Current sector: 23424. This session: NewSectorsReadOK=23408, ReadErrors=16
+Current sector: 23440. This session: NewSectorsReadOK=23424, ReadErrors=16
+Current sector: 23456. This session: NewSectorsReadOK=23440, ReadErrors=16
+Current sector: 23472. This session: NewSectorsReadOK=23456, ReadErrors=16
+Current sector: 23488. This session: NewSectorsReadOK=23472, ReadErrors=16
+Current sector: 23504. This session: NewSectorsReadOK=23488, ReadErrors=16
+Current sector: 23520. This session: NewSectorsReadOK=23504, ReadErrors=16
+Current sector: 23536. This session: NewSectorsReadOK=23520, ReadErrors=16
+Current sector: 23552. This session: NewSectorsReadOK=23536, ReadErrors=16
+Current sector: 23568. This session: NewSectorsReadOK=23552, ReadErrors=16
+Current sector: 23584. This session: NewSectorsReadOK=23568, ReadErrors=16
+Current sector: 23600. This session: NewSectorsReadOK=23584, ReadErrors=16
+Current sector: 23616. This session: NewSectorsReadOK=23600, ReadErrors=16
+Current sector: 23632. This session: NewSectorsReadOK=23616, ReadErrors=16
+Current sector: 23648. This session: NewSectorsReadOK=23632, ReadErrors=16
+Current sector: 23664. This session: NewSectorsReadOK=23648, ReadErrors=16
+Current sector: 23680. This session: NewSectorsReadOK=23664, ReadErrors=16
+Current sector: 23696. This session: NewSectorsReadOK=23680, ReadErrors=16
+Current sector: 23712. This session: NewSectorsReadOK=23696, ReadErrors=16
+Current sector: 23728. This session: NewSectorsReadOK=23712, ReadErrors=16
+Current sector: 23744. This session: NewSectorsReadOK=23728, ReadErrors=16
+Current sector: 23760. This session: NewSectorsReadOK=23744, ReadErrors=16
+Current sector: 23776. This session: NewSectorsReadOK=23760, ReadErrors=16
+Current sector: 23792. This session: NewSectorsReadOK=23776, ReadErrors=16
+Current sector: 23808. This session: NewSectorsReadOK=23792, ReadErrors=16
+Current sector: 23824. This session: NewSectorsReadOK=23808, ReadErrors=16
+Current sector: 23840. This session: NewSectorsReadOK=23824, ReadErrors=16
+Current sector: 23856. This session: NewSectorsReadOK=23840, ReadErrors=16
+Current sector: 23872. This session: NewSectorsReadOK=23856, ReadErrors=16
+Current sector: 23888. This session: NewSectorsReadOK=23872, ReadErrors=16
+Current sector: 23904. This session: NewSectorsReadOK=23888, ReadErrors=16
+Current sector: 23920. This session: NewSectorsReadOK=23904, ReadErrors=16
+Current sector: 23936. This session: NewSectorsReadOK=23920, ReadErrors=16
+Current sector: 23952. This session: NewSectorsReadOK=23936, ReadErrors=16
+Current sector: 23968. This session: NewSectorsReadOK=23952, ReadErrors=16
+Current sector: 23984. This session: NewSectorsReadOK=23968, ReadErrors=16
+Current sector: 24000. This session: NewSectorsReadOK=23984, ReadErrors=16
+Current sector: 24016. This session: NewSectorsReadOK=24000, ReadErrors=16
+Current sector: 24032. This session: NewSectorsReadOK=24016, ReadErrors=16
+Current sector: 24048. This session: NewSectorsReadOK=24032, ReadErrors=16
+Current sector: 24064. This session: NewSectorsReadOK=24048, ReadErrors=16
+Current sector: 24080. This session: NewSectorsReadOK=24064, ReadErrors=16
+Current sector: 24096. This session: NewSectorsReadOK=24080, ReadErrors=16
+Current sector: 24112. This session: NewSectorsReadOK=24096, ReadErrors=16
+Current sector: 24128. This session: NewSectorsReadOK=24112, ReadErrors=16
+Current sector: 24144. This session: NewSectorsReadOK=24128, ReadErrors=16
+Current sector: 24160. This session: NewSectorsReadOK=24144, ReadErrors=16
+Current sector: 24176. This session: NewSectorsReadOK=24160, ReadErrors=16
+Current sector: 24192. This session: NewSectorsReadOK=24176, ReadErrors=16
+Current sector: 24208. This session: NewSectorsReadOK=24192, ReadErrors=16
+Current sector: 24224. This session: NewSectorsReadOK=24208, ReadErrors=16
+Current sector: 24240. This session: NewSectorsReadOK=24224, ReadErrors=16
+Current sector: 24256. This session: NewSectorsReadOK=24240, ReadErrors=16
+Current sector: 24272. This session: NewSectorsReadOK=24256, ReadErrors=16
+Current sector: 24288. This session: NewSectorsReadOK=24272, ReadErrors=16
+Current sector: 24304. This session: NewSectorsReadOK=24288, ReadErrors=16
+Current sector: 24320. This session: NewSectorsReadOK=24304, ReadErrors=16
+Current sector: 24336. This session: NewSectorsReadOK=24320, ReadErrors=16
+Current sector: 24352. This session: NewSectorsReadOK=24336, ReadErrors=16
+Current sector: 24368. This session: NewSectorsReadOK=24352, ReadErrors=16
+Current sector: 24384. This session: NewSectorsReadOK=24368, ReadErrors=16
+Current sector: 24400. This session: NewSectorsReadOK=24384, ReadErrors=16
+Current sector: 24416. This session: NewSectorsReadOK=24400, ReadErrors=16
+Current sector: 24432. This session: NewSectorsReadOK=24416, ReadErrors=16
+Current sector: 24448. This session: NewSectorsReadOK=24432, ReadErrors=16
+Current sector: 24464. This session: NewSectorsReadOK=24448, ReadErrors=16
+Current sector: 24480. This session: NewSectorsReadOK=24464, ReadErrors=16
+Current sector: 24496. This session: NewSectorsReadOK=24480, ReadErrors=16
+Current sector: 24512. This session: NewSectorsReadOK=24496, ReadErrors=16
+Current sector: 24528. This session: NewSectorsReadOK=24512, ReadErrors=16
+Current sector: 24544. This session: NewSectorsReadOK=24528, ReadErrors=16
+Current sector: 24560. This session: NewSectorsReadOK=24544, ReadErrors=16
+Current sector: 24576. This session: NewSectorsReadOK=24560, ReadErrors=16
+Current sector: 24592. This session: NewSectorsReadOK=24576, ReadErrors=16
+Current sector: 24608. This session: NewSectorsReadOK=24592, ReadErrors=16
+Current sector: 24624. This session: NewSectorsReadOK=24608, ReadErrors=16
+Current sector: 24640. This session: NewSectorsReadOK=24624, ReadErrors=16
+Current sector: 24656. This session: NewSectorsReadOK=24640, ReadErrors=16
+Current sector: 24672. This session: NewSectorsReadOK=24656, ReadErrors=16
+Current sector: 24688. This session: NewSectorsReadOK=24672, ReadErrors=16
+Current sector: 24704. This session: NewSectorsReadOK=24688, ReadErrors=16
+Current sector: 24720. This session: NewSectorsReadOK=24704, ReadErrors=16
+Current sector: 24736. This session: NewSectorsReadOK=24720, ReadErrors=16
+Current sector: 24752. This session: NewSectorsReadOK=24736, ReadErrors=16
+Current sector: 24768. This session: NewSectorsReadOK=24752, ReadErrors=16
+Current sector: 24784. This session: NewSectorsReadOK=24768, ReadErrors=16
+Current sector: 24800. This session: NewSectorsReadOK=24784, ReadErrors=16
+Current sector: 24816. This session: NewSectorsReadOK=24800, ReadErrors=16
+Current sector: 24832. This session: NewSectorsReadOK=24816, ReadErrors=16
+Current sector: 24848. This session: NewSectorsReadOK=24832, ReadErrors=16
+Current sector: 24864. This session: NewSectorsReadOK=24848, ReadErrors=16
+Current sector: 24880. This session: NewSectorsReadOK=24864, ReadErrors=16
+Current sector: 24896. This session: NewSectorsReadOK=24880, ReadErrors=16
+Current sector: 24912. This session: NewSectorsReadOK=24896, ReadErrors=16
+Current sector: 24928. This session: NewSectorsReadOK=24912, ReadErrors=16
+Current sector: 24944. This session: NewSectorsReadOK=24928, ReadErrors=16
+Current sector: 24960. This session: NewSectorsReadOK=24944, ReadErrors=16
+Current sector: 24976. This session: NewSectorsReadOK=24960, ReadErrors=16
+Current sector: 24977. This session: NewSectorsReadOK=24961, ReadErrors=16
+Current sector: 24978. This session: NewSectorsReadOK=24962, ReadErrors=16
+Current sector: 24979. This session: NewSectorsReadOK=24963, ReadErrors=16
+Current sector: 24980. This session: NewSectorsReadOK=24964, ReadErrors=16
+Current sector: 24981. This session: NewSectorsReadOK=24965, ReadErrors=16
+Current sector: 24982. This session: NewSectorsReadOK=24966, ReadErrors=16
+Current sector: 24983. This session: NewSectorsReadOK=24967, ReadErrors=16
+Current sector: 24984. This session: NewSectorsReadOK=24968, ReadErrors=16
+Current sector: 24985. This session: NewSectorsReadOK=24969, ReadErrors=16
+Current sector: 24986. This session: NewSectorsReadOK=24970, ReadErrors=16
+Current sector: 24987. This session: NewSectorsReadOK=24971, ReadErrors=16
+Current sector: 24988. This session: NewSectorsReadOK=24972, ReadErrors=16
+Current sector: 24989. This session: NewSectorsReadOK=24973, ReadErrors=16
+Current sector: 24990. This session: NewSectorsReadOK=24974, ReadErrors=16

 16 unreadable sectors.
 CrcBuf contents, image path none (medium):
--- a/regtest/database/RS03i_read_with_ecc_file_header
+++ b/regtest/database/RS03i_read_with_ecc_file_header
@@ -84,7 +84,73 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+try_sector: trying sector 24576
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 4096
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 256
+try_sector: trying sector 24832
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
@@ -94,6 +160,138 @@ Warning: image size set to 25000 for debugging!
 .. trying layer size 98
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 8232
+RS03: try number = 2, reading sector 8330
+RS03: try number = 3, reading sector 8428
+RS03: try number = 4, reading sector 8526
+RS03: try number = 5, reading sector 8624
+RS03: try number = 6, reading sector 8722
+RS03: try number = 7, reading sector 8820
+RS03: try number = 8, reading sector 8918
+RS03: try number = 9, reading sector 9016
+RS03: try number = 10, reading sector 9114
+RS03: try number = 11, reading sector 9212
+RS03: try number = 12, reading sector 9310
+RS03: try number = 13, reading sector 9408
+RS03: try number = 14, reading sector 9506
+RS03: try number = 15, reading sector 9604
+RS03: try number = 16, reading sector 9702
+RS03: try number = 17, reading sector 9800
+RS03: try number = 18, reading sector 9898
+RS03: try number = 19, reading sector 9996
+RS03: try number = 20, reading sector 10094
+RS03: try number = 21, reading sector 10192
+RS03: try number = 22, reading sector 10290
+RS03: try number = 23, reading sector 10388
+RS03: try number = 24, reading sector 10486
+RS03: try number = 25, reading sector 10584
+RS03: try number = 26, reading sector 10682
+RS03: try number = 27, reading sector 10780
+RS03: try number = 28, reading sector 10878
+RS03: try number = 29, reading sector 10976
+RS03: try number = 30, reading sector 11074
+RS03: try number = 31, reading sector 11172
+RS03: try number = 32, reading sector 11270
+RS03: try number = 33, reading sector 11368
+RS03: try number = 34, reading sector 11466
+RS03: try number = 35, reading sector 11564
+RS03: try number = 36, reading sector 11662
+RS03: try number = 37, reading sector 11760
+RS03: try number = 38, reading sector 11858
+RS03: try number = 39, reading sector 11956
+RS03: try number = 40, reading sector 12054
+RS03: try number = 41, reading sector 12152
+RS03: try number = 42, reading sector 12250
+RS03: try number = 43, reading sector 12348
+RS03: try number = 44, reading sector 12446
+RS03: try number = 45, reading sector 12544
+RS03: try number = 46, reading sector 12642
+RS03: try number = 47, reading sector 12740
+RS03: try number = 48, reading sector 12838
+RS03: try number = 49, reading sector 12936
+RS03: try number = 50, reading sector 13034
+RS03: try number = 51, reading sector 13132
+RS03: try number = 52, reading sector 13230
+RS03: try number = 53, reading sector 13328
+RS03: try number = 54, reading sector 13426
+RS03: try number = 55, reading sector 13524
+RS03: try number = 56, reading sector 13622
+RS03: try number = 57, reading sector 13720
+RS03: try number = 58, reading sector 13818
+RS03: try number = 59, reading sector 13916
+RS03: try number = 60, reading sector 14014
+RS03: try number = 61, reading sector 14112
+RS03: try number = 62, reading sector 14210
+RS03: try number = 63, reading sector 14308
+RS03: try number = 64, reading sector 14406
+RS03: try number = 65, reading sector 14504
+RS03: try number = 66, reading sector 14602
+RS03: try number = 67, reading sector 14700
+RS03: try number = 68, reading sector 14798
+RS03: try number = 69, reading sector 14896
+RS03: try number = 70, reading sector 14994
+RS03: try number = 71, reading sector 15092
+RS03: try number = 72, reading sector 15190
+RS03: try number = 73, reading sector 15288
+RS03: try number = 74, reading sector 15386
+RS03: try number = 75, reading sector 15484
+RS03: try number = 76, reading sector 15582
+RS03: try number = 77, reading sector 15680
+RS03: try number = 78, reading sector 15778
+RS03: try number = 79, reading sector 15876
+RS03: try number = 80, reading sector 15974
+RS03: try number = 81, reading sector 16072
+RS03: try number = 82, reading sector 16170
+RS03: try number = 83, reading sector 16268
+RS03: try number = 84, reading sector 16366
+RS03: try number = 85, reading sector 16464
+RS03: try number = 86, reading sector 16562
+RS03: try number = 87, reading sector 16660
+RS03: try number = 88, reading sector 16758
+RS03: try number = 89, reading sector 16856
+RS03: try number = 90, reading sector 16954
+RS03: try number = 91, reading sector 17052
+RS03: try number = 92, reading sector 17150
+RS03: try number = 93, reading sector 17248
+RS03: try number = 94, reading sector 17346
+RS03: try number = 95, reading sector 17444
+RS03: try number = 96, reading sector 17542
+RS03: try number = 97, reading sector 17640
+RS03: try number = 98, reading sector 17738
+RS03: try number = 99, reading sector 17836
+RS03: try number = 100, reading sector 17934
+RS03: try number = 101, reading sector 18032
+RS03: try number = 102, reading sector 18130
+RS03: try number = 103, reading sector 18228
+RS03: try number = 104, reading sector 18326
+RS03: try number = 105, reading sector 18424
+RS03: try number = 106, reading sector 18522
+RS03: try number = 107, reading sector 18620
+RS03: try number = 108, reading sector 18718
+RS03: try number = 109, reading sector 18816
+RS03: try number = 110, reading sector 18914
+RS03: try number = 111, reading sector 19012
+RS03: try number = 112, reading sector 19110
+RS03: try number = 113, reading sector 19208
+RS03: try number = 114, reading sector 19306
+RS03: try number = 115, reading sector 19404
+RS03: try number = 116, reading sector 19502
+RS03: try number = 117, reading sector 19600
+RS03: try number = 118, reading sector 19698
+RS03: try number = 119, reading sector 19796
+RS03: try number = 120, reading sector 19894
+RS03: try number = 121, reading sector 19992
+RS03: try number = 122, reading sector 20090
+RS03: try number = 123, reading sector 20188
+RS03: try number = 124, reading sector 20286
+RS03: try number = 125, reading sector 20384
+RS03: try number = 126, reading sector 20482
+RS03: try number = 127, reading sector 20580
+RS03: try number = 128, reading sector 20678
+RS03: try number = 129, reading sector 20776
+RS03: try number = 130, reading sector 20874
+RS03: try number = 131, reading sector 20972
+RS03: try number = 132, reading sector 21070
 ** Success: sector 21070, rediscovered format with 39 roots
 ...augmented image found
 # Calling query_size()
--- a/regtest/database/RS03i_read_with_missing_header_exhaustive
+++ b/regtest/database/RS03i_read_with_missing_header_exhaustive
--- a/regtest/database/RS03i_read_with_missing_iso_header_exhaustive
+++ b/regtest/database/RS03i_read_with_missing_iso_header_exhaustive
--- a/regtest/database/RS03i_rediscover_170_roots
+++ b/regtest/database/RS03i_rediscover_170_roots
@@ -50,6 +50,7 @@ try_sector: trying sector 118354
 try_sector: read error, trying next header
 try_sector: trying sector 118204
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
@@ -139,6 +140,7 @@ RS03RecognizeImage: No EH, entering exhaustive search
 .. trying layer size 1409
 Scanning layers for signatures.
 - layer slice 0
+RS03: try number = 1, reading sector 118356
 ** Success: sector 118356, rediscovered format with 170 roots
 ...augmented image found
 GetImageFingerprint(16): read & cached
--- a/regtest/database/RS03i_rediscover_170_roots-padding
+++ b/regtest/database/RS03i_rediscover_170_roots-padding
@@ -50,6 +50,7 @@ try_sector: trying sector 112354
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 112204
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stéphane Lesimple	ab057244b4	fix: windows build: -mwindows in LDFLAGS instead of CLFAGS	2021-06-28 22:43:41 +02:00
Stéphane Lesimple	275decd40e	bump to patchlevel 9	2021-06-28 22:08:51 +02:00
Stéphane Lesimple	9264713614	chore: update locales	2021-06-28 22:08:51 +02:00
Stéphane Lesimple	d0fd46c97c	enh: read linear: add sectors ok/err in verbose mode print amount of correctly read sectors during session when at least one read failed, in verbose mode	2021-06-28 22:08:51 +02:00
Stéphane Lesimple	451bdf9a7e	test: fail by default	2021-06-28 22:08:51 +02:00
Stéphane Lesimple	58b558ea7e	enh: linear read: log amount of correctly read sectors during a sesssion	2021-06-27 21:04:23 +02:00
Stéphane Lesimple	6444ff67c5	enh: log window: bigger scrollback buffer	2021-06-27 21:04:23 +02:00
Stéphane Lesimple	bd9777a531	fix: --strip in console without X server would segfault & fix tests	2021-06-26 21:03:54 +02:00
Stéphane Lesimple	464f2b8bfa	doc: codecs-specs: regenerate codecs.pdf	2021-06-26 11:59:40 +02:00
Stéphane Lesimple	af178e89bc	chore: fix codec-specs Makefile We need to run latex twice to get the page numbers, figures numbers and summary right.	2021-06-26 11:59:40 +02:00
Stéphane Lesimple	8710519821	enh: windows: hide useless background console	2021-06-19 21:14:02 +02:00
Stéphane Lesimple	36fa2db965	release pl8	2021-02-22 23:26:59 +01:00
Stéphane Lesimple	442af06f7a	enh: gui: medium-info: add an 'exhaustive search' button'	2021-02-22 21:45:07 +01:00
Stéphane Lesimple	d8773e5ee6	enh: gui prefs: add a visual indication of tooltips	2021-02-21 02:18:47 +01:00
Stéphane Lesimple	5063106418	release patchlevel 7	2021-01-30 14:51:38 +01:00
Stéphane Lesimple	430fc71932	chore: update locales	2021-01-30 13:24:00 +01:00
Stéphane Lesimple	c336d039a9	feat: add -z (--strip) to remove ECC data from an iso	2021-01-30 13:17:28 +01:00
Stéphane Lesimple	fd4f8424f7	chore: update tests accordingly	2021-01-27 22:03:59 +01:00
Stéphane Lesimple	cc4547810f	enh: more logs around exhaustive RS03 search in verbose	2021-01-27 22:03:59 +01:00
Stéphane Lesimple	f5fa3d9952	enh: add --examine-rs0[23] in --debug mode for CLI	2021-01-27 22:03:59 +01:00
Stéphane Lesimple	dac6f14af0	chore: update readme	2021-01-23 11:51:26 +01:00
Stéphane Lesimple	fef782b246	fix: win: fix the last warns	2021-01-22 22:54:53 +01:00
Stéphane Lesimple	9916ce74bc	enh: try harder to find RS02/RS03 sigs in non-exhaustive mode Look at the extensive comments in the code for more context.	2021-01-21 07:29:04 +01:00
Stéphane Lesimple	355427b6e0	bump to pl6	2021-01-18 00:19:07 +01:00
Stéphane Lesimple	da44e81561	chore: debug printf format with CI	2021-01-17 15:01:49 +01:00
Stéphane Lesimple	9e5ba80e29	chore: better use of configure features	2021-01-17 15:01:49 +01:00
Stéphane Lesimple	c72b85bb9a	chore: ensure configure works properly even with -Werror	2021-01-17 15:01:49 +01:00
Stéphane Lesimple	97a4df2f21	chore: update locales	2021-01-17 00:22:13 +01:00
Stéphane Lesimple	f68efb758e	fix: printf: some potentially severe format errors	2021-01-17 00:22:13 +01:00
Stéphane Lesimple	66cf0d25ee	fix: don't use plain strings in vars as printf formats	2021-01-17 00:22:13 +01:00
Stéphane Lesimple	e8eb7824aa	fix: replace %ldd/%ld by PRId64 to remove warnings on all archs	2021-01-17 00:22:13 +01:00
Stéphane Lesimple	a3aedbd4a2	chore: configure: add DEBUG_PRINTF_FORMAT=1 to catch printf format eerrors	2021-01-17 00:22:13 +01:00
Stéphane Lesimple	83acea4684	fix: another warning under clang	2021-01-15 20:33:26 +01:00
Stéphane Lesimple	3bd06abbda	fix: warning under clang src/crcbuf.c:142:24: warning: shifting a negative signed value is undefined [-Wshift-negative-value] cb->md5State &= ~MD5_BUILDING; ~^~~~~~~~~~~~ src/dvdisaster.h:561:23: note: expanded from macro 'MD5_BUILDING' #define MD5_BUILDING 1<<0 ^ 1 warning generated.	2021-01-15 19:12:32 +01:00
Stéphane Lesimple	901e87dfcd	fix: reversed order or arguments in memset()	2021-01-15 19:12:20 +01:00
Stéphane Lesimple	4518992908	fix: allow blank media in Preferences>Error correction>RS02>query medium	2021-01-13 20:15:29 +01:00
Stéphane Lesimple	802e095cfb	fix: additional case of error with blank media in medium info This completes `396c73f5c8`	2021-01-13 20:15:29 +01:00
Stéphane Lesimple	8332b845a7	chore: windist: fix gtk-2.0 location	2021-01-13 20:15:29 +01:00