various tweaks. Global search first pass complete