diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java b/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java
index 07ae7855..5cd672bf 100644
--- a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java
+++ b/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java
@@ -60,6 +60,7 @@ public final class DecoderStream extends FilterInputStream {
      * @see java.io.FilterInputStream#in
      */
     public DecoderStream(final InputStream pStream, final Decoder pDecoder) {
+        // TODO: Let the decoder decide preferred buffer size 
         this(pStream, pDecoder, 1024);
     }
 
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java b/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java
index 58e07e2a..b50556f1 100644
--- a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java
+++ b/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java
@@ -107,6 +107,7 @@ public final class PackBitsDecoder implements Decoder {
         int read = 0;
         final int max = pBuffer.length;
 
+        // TODO: Don't decode more than single runs, because some writers add pad bytes inside the stream...
         while (read < max) {
             int n;