fixing up some of the heuristics a bit