diff --git a/include/libnyquist/AudioDecoder.h b/include/libnyquist/AudioDecoder.h
index f2a00fb..10fc4de 100644
--- a/include/libnyquist/AudioDecoder.h
+++ b/include/libnyquist/AudioDecoder.h
@@ -55,10 +55,19 @@ struct BaseDecoder
     virtual void LoadFromPath(nqr::AudioData * data, const std::string & path) = 0;
     virtual void LoadFromBuffer(nqr::AudioData * data, const std::vector<uint8_t> & memory) = 0;
     virtual std::vector<std::string> GetSupportedFileExtensions() = 0;
-    //@todo implement streaming helper methods here
 };
 
-    typedef std::pair<std::string, std::shared_ptr<nqr::BaseDecoder>> DecoderPair;
+struct StreamBuffer
+{
+        
+};
+
+struct StreamingDecoder
+{
+
+};
+
+typedef std::pair<std::string, std::shared_ptr<nqr::BaseDecoder>> DecoderPair;
 
 class NyquistIO
 {
diff --git a/src/FlacDecoder.cpp b/src/FlacDecoder.cpp
index 9ac35f6..78823f9 100644
--- a/src/FlacDecoder.cpp
+++ b/src/FlacDecoder.cpp
@@ -100,7 +100,7 @@ public:
     
     void processMetadata(const FLAC__StreamMetadata_StreamInfo & info)
     {
-        // N.B.: "Currently the reference encoder and decoders only support up to 24 bits per sample."
+        // Currently the reference encoder and decoders only support up to 24 bits per sample.
         d->sampleRate = info.sample_rate;
         d->channelCount = info.channels; // Assert 1 to 8
         d->sourceFormat = MakeFormatForBits(info.bits_per_sample, false, true);
@@ -115,7 +115,7 @@ public:
     }
 
     ///////////////////////
-    // libflab callbacks //
+    // libflac callbacks //
     ///////////////////////
     
     static FLAC__StreamDecoderWriteStatus s_writeCallback(const FLAC__StreamDecoder *, const FLAC__Frame* frame, const FLAC__int32 * const buffer[], void * userPtr)
diff --git a/src/VorbisDecoder.cpp b/src/VorbisDecoder.cpp
index 50a6378..bc30e90 100644
--- a/src/VorbisDecoder.cpp
+++ b/src/VorbisDecoder.cpp
@@ -64,7 +64,8 @@ public:
             std::cerr << errorAsString(r) << std::endl;
             throw std::runtime_error("ov_test_open failed");
         }
-        // N.B.: Don't need to fclose() after an open -- vorbis does this internally
+        
+        // Don't need to fclose() after an open -- vorbis does this internally
         
         vorbis_info *ovInfo = ov_info(fileHandle, -1);