diff --git a/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java b/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java
index 9f336a5..854fac3 100644
--- a/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java
+++ b/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java
@@ -245,6 +245,8 @@
                         }
                         else
                         {
+// TODO: FRAGMENT RESOLVER - Fragments should only be removed when they no longer
+//       match any hosts, not immediately.
                             unselectedFragments.add(m);
                         }
                     }
diff --git a/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java b/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
index 9034ccb..92c8c2e 100644
--- a/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
@@ -446,6 +446,7 @@
     }
 
 // TODO: FELIX3 - Modify to not be recursive.
+// TODO: FRAGMENT RESOLVER - Does it make sense to move this to Candidates?
     private void populateCandidates(
         ResolverState state, Module module, Candidates allCandidates,
         Map<Module, Object> resultCache)