diff --git a/src/main/java/de/ids_mannheim/korap/KorapMatch.java b/src/main/java/de/ids_mannheim/korap/KorapMatch.java
index d44c1d5..c014620 100644
--- a/src/main/java/de/ids_mannheim/korap/KorapMatch.java
+++ b/src/main/java/de/ids_mannheim/korap/KorapMatch.java
@@ -51,7 +51,7 @@
     private final static Logger log = LoggerFactory.getLogger(KorapMatch.class);
 
     // This advices the java compiler to ignore all loggings
-    public static final boolean DEBUG = true;
+    public static final boolean DEBUG = false;
 
     // Mapper for JSON serialization
     ObjectMapper mapper = new ObjectMapper();
@@ -553,7 +553,7 @@
     };
 
     // Expand the context to a span
-    // TODO: THIS IS PLAIN DUMB MAKE IT MOAR CLEVER! MOAR!!!
+    // THIS IS NOT VERY CLEVER - MAKE IT MORE CLEVER!
     public int[] expandContextToSpan (AtomicReaderContext atomic,
 				      Bits bitset,
 				      String field,
@@ -603,6 +603,9 @@
 		    newStart = contextSpans.start() > newStart ?
 			contextSpans.start() : newStart;
 
+		    if (DEBUG)
+			log.trace("NewStart is at {}", newStart);
+
 		    // Get character offset (start)
 		    if (contextSpans.isPayloadAvailable()) {
 			try {
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 5050e55..d24d82c 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -1,6 +1,6 @@
 ## logger file can be used with
 
-log4j.rootLogger = DEBUG, stdout
+#log4j.rootLogger = DEBUG, stdout
 
 # Spans:
 #log4j.logger.de.ids_mannheim.korap.query.spans.ElementSpans = TRACE, stdout