Mostly minor updates and code cleanups.  But, there is a fix to have delay_scan to actually scan text.