diff --git a/CMakeLists.txt b/CMakeLists.txt
index 324bfe1..7ebcc71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,5 +10,5 @@ endif()
 INCLUDE_DIRECTORIES("external/graph/include")
 set (CMAKE_CXX_STANDARD 11)
 
-add_executable( Sample src/cabbage.cpp )
-target_link_libraries( Sample ${OpenCV_LIBS} )
+add_executable( sample src/cabbage.cpp )
+target_link_libraries( sample ${OpenCV_LIBS} )
diff --git a/build_settings.py b/build_settings.py
index 72ac500..5bbf3f8 100644
--- a/build_settings.py
+++ b/build_settings.py
@@ -12,5 +12,5 @@
 with open('settings.txt', 'w') as f:
     f.write("{\n")
     f.write('\t"data_root": "/tmp/mpt",\n')
-    f.write('\t"deepmatching":"' + deepmatch + '",\n')
+    f.write('\t"deepmatch":"' + deepmatch + '",\n')
     f.write('\t"graph_solver":"' + graph_solver + '"\n}')
diff --git a/cabbage/MultiplePeopleTracking.py b/cabbage/MultiplePeopleTracking.py
index 52e2e6a..377f0ec 100644
--- a/cabbage/MultiplePeopleTracking.py
+++ b/cabbage/MultiplePeopleTracking.py
@@ -51,7 +51,7 @@ def execute_multiple_people_tracking(video_folder, X, Dt, video_name, dmax, sett
     dm = DeepMatching(deep_matching_binary, data_root, dmax)
     dm.generate_matches(video_folder, video_name)
 
-    reid = StackNet64x64(root)
+    reid = StackNet64x64(data_root)
 
     gg = BatchGraphGenerator(data_root, reid, dm, dmax, video_name)
     gg.build(Dt, X, W, batch_size=batch_size)
diff --git a/cabbage/__init__.py b/cabbage/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/cabbage/features/combined.py b/cabbage/features/combined.py
index 3207254..d616b18 100644
--- a/cabbage/features/combined.py
+++ b/cabbage/features/combined.py
@@ -107,7 +107,7 @@ def gen_feature_batch(batch, lookup, dmax, dm, reid, W, video_name):
 
     aabb_j, aabb_i = aabb_j[IN_RANGE], aabb_i[IN_RANGE]
     scores_i, scores_j = scores_i[IN_RANGE], scores_j[IN_RANGE]
-    frame_i, framej = frame_i[IN_RANGE], frame_j[IN_RANGE]
+    frame_i, frame_j = frame_i[IN_RANGE], frame_j[IN_RANGE]
     i = i[IN_RANGE]; j = j[IN_RANGE]
 
     Im_j, Im_i = \