Most (maybe all) of the bugs I introduced as a result of dropping the results table are fixed. Need to polish.