7's rule for HeuristicAgent and some minor changes