diff --git a/.gitignore b/.gitignore
index e04176e2e..8f6290d2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.o
 *~
 data
+mw-scripts
diff --git a/bsa/tests/output/bsa_file_test.out b/bsa/tests/output/bsa_file_test.out
index 31b73c794..0d8e76cdd 100644
--- a/bsa/tests/output/bsa_file_test.out
+++ b/bsa/tests/output/bsa_file_test.out
@@ -1,15 +1,15 @@
 Reading Morrowind.bsa
 First 10 files in archive:
-  meshes\m\probe_journeyman_01.nif (6276 bytes @126646784)
-  textures\menu_rightbuttonup_top.dds (256 bytes @218533676)
-  textures\menu_rightbuttonup_right.dds (256 bytes @218533420)
-  textures\menu_rightbuttonup_left.dds (256 bytes @218533164)
-  textures\menu_rightbuttondown_top.dds (256 bytes @218531820)
-  meshes\b\b_n_redguard_f_skins.nif (41766 bytes @17810510)
-  meshes\b\b_n_redguard_m_skins.nif (41950 bytes @18103839)
-  meshes\b\b_n_redguard_f_wrist.nif (2355 bytes @17858864)
-  meshes\b\b_n_redguard_m_foot.nif (4141 bytes @17862813)
-  meshes\b\b_n_redguard_m_knee.nif (2085 bytes @18098833)
+  meshes\m\probe_journeyman_01.nif (6276 bytes @126646052)
+  textures\menu_rightbuttonup_top.dds (256 bytes @218530052)
+  textures\menu_rightbuttonup_right.dds (256 bytes @218529796)
+  textures\menu_rightbuttonup_left.dds (256 bytes @218529540)
+  textures\menu_rightbuttondown_top.dds (256 bytes @218528196)
+  meshes\b\b_n_redguard_f_skins.nif (41766 bytes @17809778)
+  meshes\b\b_n_redguard_m_skins.nif (41950 bytes @18103107)
+  meshes\b\b_n_redguard_f_wrist.nif (2355 bytes @17858132)
+  meshes\b\b_n_redguard_m_foot.nif (4141 bytes @17862081)
+  meshes\b\b_n_redguard_m_knee.nif (2085 bytes @18098101)
 Does file 'meshes\r\xnetch_betty.nif' exist?
   Yes.
   53714 bytes
diff --git a/esm/reader.cpp b/esm/reader.cpp
index e75998659..3e16ddb7b 100644
--- a/esm/reader.cpp
+++ b/esm/reader.cpp
@@ -14,9 +14,6 @@ using namespace std;
 /* A structure used for holding fixed-length strings. In the case of
    LEN=4, it can be more efficient to match the string as a 32 bit
    number, therefore the struct is implemented as a union with an int.
-
-   TODO: Merge with SliceArray, find how to do string-specific
-   template specializations in a useful manner.
  */
 template <int LEN>
 union NAME_T
diff --git a/nifogre/tests/output/ogre_skeleton_test.out b/nifogre/tests/output/ogre_skeleton_test.out
new file mode 100644
index 000000000..053a44833
--- /dev/null
+++ b/nifogre/tests/output/ogre_skeleton_test.out
@@ -0,0 +1 @@
+Manually loading mesh mesh1