diff --git a/src/EMAlgorithm.h b/src/EMAlgorithm.h
index 3289b61b..f44abd99 100644
--- a/src/EMAlgorithm.h
+++ b/src/EMAlgorithm.h
@@ -134,7 +134,7 @@ struct EMAlgorithm {
             "kallisto_id" << "\t" <<
             "rho" << "\t" <<
             "tpm" << "\t" <<
-            "expected_counts" <<
+            "est_counts" <<
             std::endl;
 
         const double MILLION = 1e6;
diff --git a/src/KmerIndex.h b/src/KmerIndex.h
index 7662af21..250305aa 100644
--- a/src/KmerIndex.h
+++ b/src/KmerIndex.h
@@ -275,6 +275,8 @@ struct KmerIndex
         assert(num_trans == target_names_.size());
         for (auto& tid : target_names_) {
             // 9.1 write out how many bytes
+            // XXX: Note: this doesn't actually encore the max targ id size.
+            // might cause problems in the future
             tmp_size = tid.size();
             out.write((char*)&tmp_size, sizeof(tmp_size));
 
@@ -396,7 +398,7 @@ struct KmerIndex
 		target_names_.reserve(num_trans);
 
         size_t tmp_size;
-        char buffer[1024];
+        char buffer[1024]; // if your target_name is longer than this, screw you.
         for (auto i = 0; i < num_trans; ++i) {
             // 9.1 read in the size
             in.read((char*)&tmp_size, sizeof(tmp_size));