diff --git a/src/search/AAA_Mechanical_Changes.md b/src/search/AAA_Mechanical_Changes.md
index 7ee39e3764..dca0be6b2d 100644
--- a/src/search/AAA_Mechanical_Changes.md
+++ b/src/search/AAA_Mechanical_Changes.md
@@ -66,11 +66,11 @@ search
 ├── ✅ evaluation_result.h
 ├── ✅ evaluator_cache.cc
 ├── ✅ evaluator_cache.h
-├── ❓ evaluator.cc
-├── ❓ evaluator.h
+├── ✅ evaluator.cc
+├── ✅ evaluator.h
 ├── ✅ evaluators
-├── ❓ heuristic.cc
-├── ❓ heuristic.h
+├── ✅ heuristic.cc
+├── ✅ heuristic.h
 ├── ✅ heuristics
 ├── ✅ landmarks
 ├── ✅ lp
@@ -78,7 +78,7 @@ search
 ├── ✅ open_list_factory.cc
 ├── ✅ open_list_factory.h
 ├── ✅ open_list.h
-├── ❌ open_lists
+├── ✅ open_lists
 ├── ✅ operator_cost.cc
 ├── ✅ operator_cost.h
 ├── ✅ operator_counting
@@ -95,7 +95,7 @@ search
 ├── ✅ plan_manager.h
 ├── ✅ planner.cc
 ├── ✅ plugins
-├── ❌ potentials
+├── ✅ potentials
 ├── ✅ pruning
 ├── ✅ pruning_method.cc
 ├── ✅ pruning_method.h
@@ -117,8 +117,8 @@ search
 │      ├── ✅ plugin_lazy.cc
 │      ├── ✅ plugin_lazy_greedy.cc
 │      ├── ✅ plugin_lazy_wastar.cc
-│      ├── ❓ search_common.cc
-│      └── ❓ search_common.h
+│      ├── ✅ search_common.cc
+│      └── ✅ search_common.h
 ├── ✅ search_node_info.cc
 ├── ✅ search_node_info.h
 ├── ✅ search_progress.cc
diff --git a/src/search/cartesian_abstractions/additive_cartesian_heuristic.cc b/src/search/cartesian_abstractions/additive_cartesian_heuristic.cc
index 59436d67c2..88963428c3 100644
--- a/src/search/cartesian_abstractions/additive_cartesian_heuristic.cc
+++ b/src/search/cartesian_abstractions/additive_cartesian_heuristic.cc
@@ -146,7 +146,7 @@ class AdditiveCartesianHeuristicFeature
     virtual shared_ptr<AdditiveCartesianHeuristic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
         return plugins::make_shared_from_arg_tuples<AdditiveCartesianHeuristic>(
-            opts.get<vector<shared_ptr<SubtaskGenerator>>>("subtasks"), // TODO issue1082 why not get_list?
+            opts.get_list<shared_ptr<SubtaskGenerator>>("subtasks"),
             opts.get<int>("max_states"),
             opts.get<int>("max_transitions"),
             opts.get<double>("max_time"),
diff --git a/src/search/evaluator.cc b/src/search/evaluator.cc
index 530ce89b24..fb35f178c3 100644
--- a/src/search/evaluator.cc
+++ b/src/search/evaluator.cc
@@ -83,11 +83,6 @@ void add_evaluator_options_to_feature(plugins::Feature &feature, const string &d
     utils::add_log_options_to_feature(feature);
 }
 
-// TODO 1082 remove this, just keep the one above
-void add_evaluator_options_to_feature(plugins::Feature &feature) {
-    utils::add_log_options_to_feature(feature);
-}
-
 tuple<string, utils::Verbosity> get_evaluator_arguments_from_options(
     const plugins::Options &opts) {
     return tuple_cat(
diff --git a/src/search/evaluator.h b/src/search/evaluator.h
index 5ab55daf99..a3a5726686 100644
--- a/src/search/evaluator.h
+++ b/src/search/evaluator.h
@@ -102,7 +102,6 @@ class Evaluator {
 };
 
 extern void add_evaluator_options_to_feature(plugins::Feature &feature, const std::string &description);
-extern void add_evaluator_options_to_feature(plugins::Feature &feature); // TODO 1082 remove this, just keep the one above
 
 extern std::tuple<std::string, utils::Verbosity> get_evaluator_arguments_from_options(const plugins::Options &opts);
 extern std::tuple<bool, bool, bool> get_evaluator_default_arguments();
diff --git a/src/search/landmarks/landmark_cost_partitioning_heuristic.cc b/src/search/landmarks/landmark_cost_partitioning_heuristic.cc
index 9639473c94..36bce18a7e 100644
--- a/src/search/landmarks/landmark_cost_partitioning_heuristic.cc
+++ b/src/search/landmarks/landmark_cost_partitioning_heuristic.cc
@@ -39,9 +39,9 @@ LandmarkCostPartitioningHeuristic::LandmarkCostPartitioningHeuristic(
 }
 
 void LandmarkCostPartitioningHeuristic::check_unsupported_features(
-    const plugins::Options &opts) {
+    const plugins::Options &lm_factory_option) {
     shared_ptr<LandmarkFactory> lm_graph_factory =
-        opts.get<shared_ptr<LandmarkFactory>>("lm_factory");
+        lm_factory_option.get<shared_ptr<LandmarkFactory>>("lm_factory");
 
     if (task_properties::has_axioms(task_proxy)) {
         cerr << "Cost partitioning does not support axioms." << endl;
diff --git a/src/search/landmarks/landmark_cost_partitioning_heuristic.h b/src/search/landmarks/landmark_cost_partitioning_heuristic.h
index 8d7de52067..bbcb4877c2 100644
--- a/src/search/landmarks/landmark_cost_partitioning_heuristic.h
+++ b/src/search/landmarks/landmark_cost_partitioning_heuristic.h
@@ -15,7 +15,7 @@ enum class CostPartitioningMethod {
 class LandmarkCostPartitioningHeuristic : public LandmarkHeuristic {
     std::unique_ptr<CostPartitioningAlgorithm> cost_partitioning_algorithm;
 
-    void check_unsupported_features(const plugins::Options &opts); // TODO issue1082 this needs Options to construct the lm_factory later.
+    void check_unsupported_features(const plugins::Options &lm_factory_option); // TODO issue1082 this needs Options to construct the lm_factory later.
     void set_cost_partitioning_algorithm(CostPartitioningMethod cost_partitioning,
                                          lp::LPSolverType lpsolver,
                                          bool alm);
@@ -32,7 +32,7 @@ class LandmarkCostPartitioningHeuristic : public LandmarkHeuristic {
        This should be handled by issue559 eventually.
     */
     LandmarkCostPartitioningHeuristic(
-        const plugins::Options &options,
+        const plugins::Options &lm_factory_option,
         bool use_preferred_operators,
         bool prog_goal,
         bool prog_gn,
diff --git a/src/search/landmarks/landmark_sum_heuristic.cc b/src/search/landmarks/landmark_sum_heuristic.cc
index 5ba1be9e59..94b82a340a 100644
--- a/src/search/landmarks/landmark_sum_heuristic.cc
+++ b/src/search/landmarks/landmark_sum_heuristic.cc
@@ -31,7 +31,7 @@ static bool are_dead_ends_reliable(
 }
 
 LandmarkSumHeuristic::LandmarkSumHeuristic(
-    const plugins::Options &lm_factory_options,
+    const plugins::Options &lm_factory_option,
     bool use_preferred_operators,
     bool prog_goal,
     bool prog_gn,
@@ -44,12 +44,12 @@ LandmarkSumHeuristic::LandmarkSumHeuristic(
                         description, verbosity),
       dead_ends_reliable(
           are_dead_ends_reliable(
-              lm_factory_options.get<shared_ptr<LandmarkFactory>>("lm_factory"),
+              lm_factory_option.get<shared_ptr<LandmarkFactory>>("lm_factory"),
               task_proxy)) {
     if (log.is_at_least_normal()) {
         log << "Initializing landmark sum heuristic..." << endl;
     }
-    initialize(lm_factory_options, prog_goal, prog_gn, prog_r);
+    initialize(lm_factory_option, prog_goal, prog_gn, prog_r);
     compute_landmark_costs();
 }
 
diff --git a/src/search/landmarks/landmark_sum_heuristic.h b/src/search/landmarks/landmark_sum_heuristic.h
index 835c147056..6e89696d18 100644
--- a/src/search/landmarks/landmark_sum_heuristic.h
+++ b/src/search/landmarks/landmark_sum_heuristic.h
@@ -24,7 +24,7 @@ class LandmarkSumHeuristic : public LandmarkHeuristic {
        after this happened, so we allow the landmark heuristics to keep a
        (small) options object around for that purpose.
     */
-    LandmarkSumHeuristic(const plugins::Options &lm_factory_options,
+    LandmarkSumHeuristic(const plugins::Options &lm_factory_option,
                          bool use_preferred_operators,
                          bool prog_goal,
                          bool prog_gn,
diff --git a/src/search/search_algorithm.cc b/src/search/search_algorithm.cc
index a47d3d2db0..2519fc1936 100644
--- a/src/search/search_algorithm.cc
+++ b/src/search/search_algorithm.cc
@@ -67,7 +67,7 @@ SearchAlgorithm::SearchAlgorithm(
     task_properties::print_variable_statistics(task_proxy);
 }
 
-SearchAlgorithm::SearchAlgorithm(const plugins::Options &opts) // TODO issue1082 needed for iterated search
+SearchAlgorithm::SearchAlgorithm(const plugins::Options &opts) // TODO objections object is needed for iterated search, the prototype for issue559 resolves this
     : description(opts.get_unparsed_config()),
       status(IN_PROGRESS),
       solution_found(false),
diff --git a/src/search/search_algorithm.h b/src/search/search_algorithm.h
index 5b4365deab..5f0c464b90 100644
--- a/src/search/search_algorithm.h
+++ b/src/search/search_algorithm.h
@@ -66,7 +66,7 @@ class SearchAlgorithm {
         double max_time,
         const std::string &description,
         utils::Verbosity verbosity);
-    explicit SearchAlgorithm(const plugins::Options &opts); // TODO issue1082 needed for iterated search
+    explicit SearchAlgorithm(const plugins::Options &opts); // TODO objections object is needed for iterated search, the prototype for issue559 resolves this
     virtual ~SearchAlgorithm();
     virtual void print_statistics() const = 0;
     virtual void save_plan_if_necessary();
diff --git a/src/search/search_algorithms/enforced_hill_climbing_search.cc b/src/search/search_algorithms/enforced_hill_climbing_search.cc
index 7ab17686b7..087e04d67d 100644
--- a/src/search/search_algorithms/enforced_hill_climbing_search.cc
+++ b/src/search/search_algorithms/enforced_hill_climbing_search.cc
@@ -32,7 +32,7 @@ static shared_ptr<OpenListFactory> create_ehc_open_list_factory(
     } else {
         /*
           TODO: Reduce code duplication with search_common.cc,
-          function create_astar_open_list_factory_and_f_eval.  TODO: issue1082 update comment
+          function create_astar_open_list_factory_and_f_eval.
 
           It would probably make sense to add a factory function or
           constructor that encapsulates this work to the tie-breaking
diff --git a/src/search/search_algorithms/iterated_search.h b/src/search/search_algorithms/iterated_search.h
index f3a2dc875d..026ba53804 100644
--- a/src/search/search_algorithms/iterated_search.h
+++ b/src/search/search_algorithms/iterated_search.h
@@ -29,7 +29,7 @@ class IteratedSearch : public SearchAlgorithm {
     virtual SearchStatus step() override;
 
 public:
-    IteratedSearch(const plugins::Options &opts); // TODO issue1082 still needs the options objects, the prototype for issue559 resolves this
+    IteratedSearch(const plugins::Options &opts); // TODO this still needs the options objects, the prototype for issue559 resolves this
 
     virtual void save_plan_if_necessary() override;
     virtual void print_statistics() const override;
diff --git a/src/search/search_algorithms/plugin_eager_greedy.cc b/src/search/search_algorithms/plugin_eager_greedy.cc
index 1b5ae8d319..c57efd7261 100644
--- a/src/search/search_algorithms/plugin_eager_greedy.cc
+++ b/src/search/search_algorithms/plugin_eager_greedy.cc
@@ -34,28 +34,28 @@ class EagerGreedySearchFeature : public plugins::TypedFeature<SearchAlgorithm, e
         document_note(
             "Closed nodes",
             "Closed node are not re-opened");
-        document_note( // TODO issue1082 confirm this
+        document_note(
             "Equivalent statements using general eager search",
             "\n```\n--evaluator h2=eval2\n"
-            "--search eager_greedy([eval1, h2], preferred=h2, boost=100)\n```\n"
+            "--search eager_greedy([eval1, h2], preferred=[h2], boost=100)\n```\n"
             "is equivalent to\n"
             "```\n--evaluator h1=eval1 --heuristic h2=eval2\n"
             "--search eager(alt([single(h1), single(h1, pref_only=true), single(h2), \n"
             "                    single(h2, pref_only=true)], boost=100),\n"
-            "               preferred=h2)\n```\n"
+            "               preferred=[h2])\n```\n"
             "------------------------------------------------------------\n"
             "```\n--search eager_greedy([eval1, eval2])\n```\n"
             "is equivalent to\n"
             "```\n--search eager(alt([single(eval1), single(eval2)]))\n```\n"
             "------------------------------------------------------------\n"
             "```\n--evaluator h1=eval1\n"
-            "--search eager_greedy(h1, preferred=h1)\n```\n"
+            "--search eager_greedy([h1], preferred=[h1])\n```\n"
             "is equivalent to\n"
             "```\n--evaluator h1=eval1\n"
             "--search eager(alt([single(h1), single(h1, pref_only=true)]),\n"
-            "               preferred=h1)\n```\n"
+            "               preferred=[h1])\n```\n"
             "------------------------------------------------------------\n"
-            "```\n--search eager_greedy(eval1)\n```\n"
+            "```\n--search eager_greedy([eval1])\n```\n"
             "is equivalent to\n"
             "```\n--search eager(single(eval1))\n```\n", true);
     }
diff --git a/src/search/search_algorithms/plugin_lazy_greedy.cc b/src/search/search_algorithms/plugin_lazy_greedy.cc
index 0431d4bc55..072c0d3b48 100644
--- a/src/search/search_algorithms/plugin_lazy_greedy.cc
+++ b/src/search/search_algorithms/plugin_lazy_greedy.cc
@@ -47,24 +47,24 @@ class LazyGreedySearchFeature : public plugins::TypedFeature<SearchAlgorithm, la
         document_note( // TODO issue1082 confirm this
             "Equivalent statements using general lazy search",
             "\n```\n--evaluator h2=eval2\n"
-            "--search lazy_greedy([eval1, h2], preferred=h2, boost=100)\n```\n"
+            "--search lazy_greedy([eval1, h2], preferred=[h2], boost=100)\n```\n"
             "is equivalent to\n"
             "```\n--evaluator h1=eval1 --heuristic h2=eval2\n"
             "--search lazy(alt([single(h1), single(h1, pref_only=true), single(h2),\n"
             "                  single(h2, pref_only=true)], boost=100),\n"
-            "              preferred=h2)\n```\n"
+            "              preferred=[h2])\n```\n"
             "------------------------------------------------------------\n"
             "```\n--search lazy_greedy([eval1, eval2], boost=100)\n```\n"
             "is equivalent to\n"
             "```\n--search lazy(alt([single(eval1), single(eval2)], boost=100))\n```\n"
             "------------------------------------------------------------\n"
-            "```\n--evaluator h1=eval1\n--search lazy_greedy(h1, preferred=h1)\n```\n"
+            "```\n--evaluator h1=eval1\n--search lazy_greedy([h1], preferred=[h1])\n```\n"
             "is equivalent to\n"
             "```\n--evaluator h1=eval1\n"
             "--search lazy(alt([single(h1), single(h1, pref_only=true)], boost=1000),\n"
-            "              preferred=h1)\n```\n"
+            "              preferred=[h1])\n```\n"
             "------------------------------------------------------------\n"
-            "```\n--search lazy_greedy(eval1)\n```\n"
+            "```\n--search lazy_greedy([eval1])\n```\n"
             "is equivalent to\n"
             "```\n--search lazy(single(eval1))\n```\n",
             true);
diff --git a/src/search/search_algorithms/search_common.cc b/src/search/search_algorithms/search_common.cc
index c43d3b0bc6..63a1f9000e 100644
--- a/src/search/search_algorithms/search_common.cc
+++ b/src/search/search_algorithms/search_common.cc
@@ -5,7 +5,6 @@
 #include "../evaluators/g_evaluator.h"
 #include "../evaluators/sum_evaluator.h"
 #include "../evaluators/weighted_evaluator.h"
-#include "../plugins/options.h"
 #include "../open_lists/alternation_open_list.h"
 #include "../open_lists/best_first_open_list.h"
 #include "../open_lists/tiebreaking_open_list.h"