Delete some obsolete variables
Add bug fix for Ctrl-F searching...
Better fix for saved-overrinding-map bug.
Fix saved-overriding-map issue