changed ""heuristics"", small fixes