changed some speed-intensive heuristics out