several more improvements in 'local scan-mode'