diff --git a/inst/CMakeLists.txt b/inst/CMakeLists.txt
index 16bbc7e..344a7a3 100644
--- a/inst/CMakeLists.txt
+++ b/inst/CMakeLists.txt
@@ -38,9 +38,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ltbb")
 # set(CMAKE_PREFIX_PATH "/opt/intel/oneapi/tbb/latest/lib/intel64/gcc4.8")
 # find_library(TBB_LIB tbb)
 # find_path(TBB_PATH
- #       HINTS /opt/intel/oneapi/tbb/latest/include
- #       NAMES tbb/parallel_for.h)
- 
+#       HINTS /opt/intel/oneapi/tbb/latest/include
+#       NAMES tbb/parallel_for.h)
+
 set(SOURCE_FILES
         Clion/main.cpp
         ../src/C++/CMExplore/cmdline.h
@@ -93,8 +93,7 @@ set(SOURCE_FILES
         ../src/C++/IOExplore/IOExplore.h
         ../src/C++/common.cpp
         ../src/C++/common.h
-        ../src/C++/stl.h
-        ../src/C++/stlpmt.lib)
+        ../src/C++/stl.h)
 
 add_executable(Explore ${SOURCE_FILES})
 
diff --git a/src/C++/Explore/explore.cpp b/src/C++/Explore/explore.cpp
index 521f785..1fc5ca7 100755
--- a/src/C++/Explore/explore.cpp
+++ b/src/C++/Explore/explore.cpp
@@ -395,12 +395,12 @@ void Explore::SummarisePerformance() {
           case ACCURACY:
             CurrentValue = (*CurrentCandidate).Performance.Accuracy.Value;
             break;
-            case BALANCEDACCURACY:
-                CurrentValue = (*CurrentCandidate).Performance.BalancedAccuracy.Value;
-                break;
-            case F1SCORE:
-                CurrentValue = (*CurrentCandidate).Performance.F1score.Value;
-                break;
+        case BALANCEDACCURACY:
+            CurrentValue = (*CurrentCandidate).Performance.BalancedAccuracy.Value;
+            break;
+        case F1SCORE:
+            CurrentValue = (*CurrentCandidate).Performance.F1score.Value;
+            break;
         }
 		// Calculate minimum performance
         if (CurrentValue<MinimumPerformance) {
diff --git a/src/C++/Explore/rule.cpp b/src/C++/Explore/rule.cpp
index 1e406b8..cd339a4 100755
--- a/src/C++/Explore/rule.cpp
+++ b/src/C++/Explore/rule.cpp
@@ -3528,6 +3528,12 @@ bool RULE::CompareConstraints(PERFORMANCE CurrentPerformance, bool Initialised,
                         break;
                     case ACCURACY:
                         RuleValue = CurrentPerformance.Accuracy.Value;
+                        break;
+                    case BALANCEDACCURACY:
+                        RuleValue = CurrentPerformance.BalancedAccuracy.Value;
+                        break;
+                    case F1SCORE:
+                        RuleValue = CurrentPerformance.F1score.Value;
                 }
                 ConstraintValue = (*CurrentConstraint).Value;
                 if (ConstraintValue > RuleValue) {
diff --git a/src/C++/IOExplore/IOExplore.cpp b/src/C++/IOExplore/IOExplore.cpp
index aa33e92..e02df90 100644
--- a/src/C++/IOExplore/IOExplore.cpp
+++ b/src/C++/IOExplore/IOExplore.cpp
@@ -62,8 +62,8 @@ IOExplore::IOExplore() {
   Dummy.push_back("Accuracy");
   Dummy.push_back("PPV");
   Dummy.push_back("NPV");
-    Dummy.push_back("BalancedAccuracy");
-    Dummy.push_back("F1score");
+  Dummy.push_back("BalancedAccuracy");
+  Dummy.push_back("F1score");
   Sections.push_back(Dummy);
   Dummy.clear();
 
@@ -585,13 +585,12 @@ bool IOExplore::SaveExploreToProject(string IOFilename) {
       case NPV:
         ProjectSettings.Maximize = NPV;        
         break;
-
-        case BALANCEDACCURACY:
-            ProjectSettings.Maximize = BALANCEDACCURACY;
-            break;
-        case F1SCORE:
-            ProjectSettings.Maximize = F1SCORE;
-            break;
+      case BALANCEDACCURACY:
+        ProjectSettings.Maximize = BALANCEDACCURACY;
+        break;
+      case F1SCORE:
+        ProjectSettings.Maximize = F1SCORE;
+        break;
     }
 
     vector<CONSTRAINT> Constraints = Project->GetConstraints();
@@ -624,16 +623,16 @@ bool IOExplore::SaveExploreToProject(string IOFilename) {
             ProjectSettings.Accuracy = (*CurrentConstraint).Value;
           }
           break;
-          case BALANCEDACCURACY:
-              if ((*CurrentConstraint).Value != 0){
-                  ProjectSettings.BalancedAccuracy = (*CurrentConstraint).Value;
-              }
-              break;
-          case F1SCORE:
-              if ((*CurrentConstraint).Value != 0){
-                  ProjectSettings.F1score = (*CurrentConstraint).Value;
-              }
-              break;
+        case BALANCEDACCURACY:
+          if ((*CurrentConstraint).Value != 0){
+              ProjectSettings.BalancedAccuracy = (*CurrentConstraint).Value;
+          }
+          break;
+        case F1SCORE:
+          if ((*CurrentConstraint).Value != 0){
+              ProjectSettings.F1score = (*CurrentConstraint).Value;
+          }
+          break;
       }
     }
     ProjectFile.flush();
@@ -865,12 +864,12 @@ bool IOExplore::SaveSettingsToFile(string IOFilename) {
       case NPV:
         ProjectFile << "Maximize=NPV" << endl;
         break;
-        case BALANCEDACCURACY:
-            ProjectFile << "Maximize=BALANCEDACCURACY" << endl;
-            break;
-        case F1SCORE:
-            ProjectFile << "Maximize=F1SCORE" << endl;
-            break;
+      case BALANCEDACCURACY:
+        ProjectFile << "Maximize=BALANCEDACCURACY" << endl;
+        break;
+      case F1SCORE:
+        ProjectFile << "Maximize=F1SCORE" << endl;
+        break;
     }
     if (ProjectSettings.Sensitivity>0) {
       ProjectFile << "Sensitivity=" << ProjectSettings.Sensitivity << endl;
@@ -887,12 +886,12 @@ bool IOExplore::SaveSettingsToFile(string IOFilename) {
     if (ProjectSettings.Accuracy>0) {
       ProjectFile << "Accuracy=" << ProjectSettings.Accuracy << endl;
     }
-      if (ProjectSettings.BalancedAccuracy>0) {
-          ProjectFile << "BalancedAccuracy=" << ProjectSettings.BalancedAccuracy << endl;
-      }
-      if (ProjectSettings.F1score>0) {
-          ProjectFile << "F1score=" << ProjectSettings.F1score << endl;
-      }
+    if (ProjectSettings.BalancedAccuracy>0) {
+      ProjectFile << "BalancedAccuracy=" << ProjectSettings.BalancedAccuracy << endl;
+    }
+    if (ProjectSettings.F1score>0) {
+      ProjectFile << "F1score=" << ProjectSettings.F1score << endl;
+    }
     ProjectFile << "[Output]" << endl;
     switch (ProjectSettings.OutputMethod) {
       case EVERY:
@@ -1366,7 +1365,7 @@ bool IOExplore::SetupExploreFromProject(string IOFilename) {
             if (atof(CurrentValue.c_str())>0 && atof(CurrentValue.c_str())<1) {
                 ProjectSettings.BalancedAccuracy = atof(CurrentValue.c_str());
             } else {
-                ProjectLoadErrors.push_back("Invalid value for constraint NPV.");
+                ProjectLoadErrors.push_back("Invalid value for constraint Balanced Accuracy.");
                 return false;
             }
         }
@@ -1375,7 +1374,7 @@ bool IOExplore::SetupExploreFromProject(string IOFilename) {
             if (atof(CurrentValue.c_str())>0 && atof(CurrentValue.c_str())<1) {
                 ProjectSettings.F1score = atof(CurrentValue.c_str());
             } else {
-                ProjectLoadErrors.push_back("Invalid value for constraint NPV.");
+                ProjectLoadErrors.push_back("Invalid value for constraint F1score.");
                 return false;
             }
         }