rework to try to fix stage_finder and color_line_finder, not all changes denoted by # ********* have been reverted