Heuristic outline: small improvements