diff --git a/CMakeLists.txt b/CMakeLists.txt
index 304167d..6cce2ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.25)
-project(blt-gp VERSION 0.0.62)
+project(blt-gp VERSION 0.0.63)
 
 include(CTest)
 
diff --git a/include/blt/gp/program.h b/include/blt/gp/program.h
index 44f738e..3b0cdb9 100644
--- a/include/blt/gp/program.h
+++ b/include/blt/gp/program.h
@@ -448,7 +448,7 @@ namespace blt::gp
                 std::vector<std::unique_ptr<std::thread>> threads;
                 std::mutex evaluation_control;
                 std::atomic_uint64_t evaluation_left = 0;
-                std::atomic_uint64_t threads_left = 0;
+                std::atomic_int64_t threads_left = 0;
                 
                 std::atomic_bool lifetime_over = false;
             } thread_helper;
@@ -478,11 +478,14 @@ namespace blt::gp
                 {
                     std::scoped_lock lock(thread_helper.evaluation_control);
                     thread_helper.evaluation_left = current_pop.get_individuals().size();
-                    thread_helper.threads_left = config.threads + 1;
+                    thread_helper.threads_left = static_cast<blt::i64>(config.threads) + 1;
                 }
                 
+                //std::cout << "Wait" << std::endl;
+                execute_thread();
                 while (thread_helper.threads_left > 0)
-                    execute_thread();
+                    std::this_thread::yield();
+                //std::cout << "Finished" << std::endl;
                 
 //                for (auto& ind : current_pop.get_individuals())
 //                {
diff --git a/src/program.cpp b/src/program.cpp
index c5232ce..b1cf001 100644
--- a/src/program.cpp
+++ b/src/program.cpp
@@ -61,7 +61,6 @@ namespace blt::gp
                 {
                     execute_thread();
                 }
-                std::cout << "Ending Thread!" << std::endl;
             }));
         }
     }
@@ -70,6 +69,7 @@ namespace blt::gp
     {
         if (thread_helper.evaluation_left > 0)
         {
+            //std::cout << "Thread beginning" << std::endl;
             while (thread_helper.evaluation_left > 0)
             {
                 blt::size_t begin = 0;
@@ -91,8 +91,7 @@ namespace blt::gp
                     auto old_best = current_stats.best_fitness.load();
                     while (ind.fitness.adjusted_fitness > old_best &&
                            !current_stats.best_fitness.compare_exchange_weak(old_best, ind.fitness.adjusted_fitness,
-                                                                             std::memory_order_release,
-                                                                             std::memory_order_relaxed));
+                                                                             std::memory_order_release, std::memory_order_relaxed));
                     
                     auto old_worst = current_stats.worst_fitness.load();
                     while (ind.fitness.adjusted_fitness < old_worst &&
@@ -105,6 +104,7 @@ namespace blt::gp
                 }
             }
             thread_helper.threads_left--;
+            //std::cout << "thread finished!" << std::endl;
         }
     }
 }
\ No newline at end of file