diff --git a/Makefile b/Makefile
index 4a03bb0..66e6046 100644
--- a/Makefile
+++ b/Makefile
@@ -245,12 +245,10 @@ Tools/E.tgz: Tools/.f
 	cd Tools ; curl -OL http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/$(eprover_version)/E.tgz
 
 # vampire
-Tools/vampire: Tools/Vampires
-	cp Tools/Vampires/vampire_x86_64 Tools/vampire
-Tools/Vampires: Tools/vampire.zip
-	cd Tools ; unzip -D vampire.zip
+Tools/vampire: Tools/vampire.zip
+	cd Tools ; unzip -d vampire vampire.zip
 Tools/vampire.zip: Tools/.f
-	cd Tools ; curl -OL http://forsyte.at/wp-content/uploads/vampire.zip
+	cd Tools ; curl -L -o vampire.zip https://github.com/vprover/vampire/releases/download/v4.7/vampire4.7.zip
 
 # spot/ltl2tgba
 Tools/ltl2tgba: Tools/spot-$(spot_version)
diff --git a/Sources/BoundedSynthesis/Options.swift b/Sources/BoundedSynthesis/Options.swift
index d86b14c..8c0771f 100644
--- a/Sources/BoundedSynthesis/Options.swift
+++ b/Sources/BoundedSynthesis/Options.swift
@@ -43,16 +43,16 @@ public enum Target: String {
 }
 
 public enum SimplifcationLevel: String {
-    case small //new default, faster
-    case medium
-    case high
+    case small = "--small" //new default, faster
+    case medium = "--medium"
+    case high = "--high"
 
     public static let allValues: [SimplifcationLevel] = [.small, .medium, .high]
 }
 
 public enum SimplifcationGoal: String {
-    case any //new default, faster
-    case small
+    case any = "--any" //new default, faster
+    case small = "--small"
 
     public static let allValues: [SimplifcationGoal] = [.any, .small]
 }