Minor comments
diff --git a/src/main/java/de/ids_mannheim/korap/KorapQuery.java b/src/main/java/de/ids_mannheim/korap/KorapQuery.java
index 53fbe8d..0233234 100644
--- a/src/main/java/de/ids_mannheim/korap/KorapQuery.java
+++ b/src/main/java/de/ids_mannheim/korap/KorapQuery.java
@@ -18,6 +18,11 @@
 import org.slf4j.LoggerFactory;
 
 /*
+  Todo: All queries with a final right expansion
+  der alte []
+  should be wrapped in a contains(<base/s=t>) to ensure
+  they are not outside the text.
+
   TODO: Create Pre-filter while preparing a Query.
   The pre-filter will contain a boolena query with all
   necessary terms, supporting boolean OR, ignoring
@@ -25,12 +30,6 @@
   [base=Der]([base=alte]|[base=junge])[base=Mann & p!=ADJA]![base=war | base=lag]
   Search for all documents containing "s:Der" and ("s:alte" or "s:junge") and "s:Mann"
 
-  TODO: korap:reference doesn't work as expected:
-  - Check with
-    - focus(2:{1:[orth=der]{3:{2:[orth=Baum]}}})
-    - focus(3:startswith(<s>,{3:[tt/p=ART]{1:{2:[tt/p=ADJA]{3,4}}[tt/p=NN]}}))
-    - focus(3:endswith(<s>,{3:[tt/p=ART]{1:{2:[tt/p=ADJA]{3,4}}[tt/p=NN]}}))
-
 */
 
 /**
diff --git a/src/test/java/de/ids_mannheim/korap/query/TestTemporaryQueryLimitations.java b/src/test/java/de/ids_mannheim/korap/query/TestTemporaryQueryLimitations.java
index 5120bab..b015091 100644
--- a/src/test/java/de/ids_mannheim/korap/query/TestTemporaryQueryLimitations.java
+++ b/src/test/java/de/ids_mannheim/korap/query/TestTemporaryQueryLimitations.java
@@ -1,7 +1,5 @@
 package de.ids_mannheim.korap.query;
 
-//package de.ids_mannheim.korap.highlight;
-
 import java.util.*;
 import java.io.IOException;
 
@@ -17,7 +15,6 @@
 import de.ids_mannheim.korap.util.QueryException;
 
 import static de.ids_mannheim.korap.TestSimple.*;
-//import static de.ids_mannheim.korap.Test.*;
 
 import static org.junit.Assert.*;
 import org.junit.Test;