messing with heuristics, small improvements