diff --git a/Makefile.am b/Makefile.am
index f81570a3..f12f58d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,6 +63,7 @@ magicseteditor_SOURCES += ./src/script/scriptable.cpp
 magicseteditor_SOURCES += ./src/script/script_manager.cpp
 magicseteditor_SOURCES += ./src/script/functions/english.cpp
 magicseteditor_SOURCES += ./src/script/functions/basic.cpp
+magicseteditor_SOURCES += ./src/script/functions/regex.cpp
 magicseteditor_SOURCES += ./src/script/functions/editor.cpp
 magicseteditor_SOURCES += ./src/script/functions/image.cpp
 magicseteditor_SOURCES += ./src/script/functions/export.cpp
@@ -134,6 +135,7 @@ magicseteditor_SOURCES += ./src/gui/set/set_info_panel.cpp
 magicseteditor_SOURCES += ./src/gui/set/keywords_panel.cpp
 magicseteditor_SOURCES += ./src/gui/set/panel.cpp
 magicseteditor_SOURCES += ./src/gui/set/stats_panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/random_pack_panel.cpp
 magicseteditor_SOURCES += ./src/gui/set/window.cpp
 magicseteditor_SOURCES += ./src/gui/thumbnail_thread.cpp
 magicseteditor_SOURCES += ./src/gui/welcome_window.cpp
diff --git a/Makefile.in b/Makefile.in
index 91f2e28d..8d64b6cd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -96,6 +96,7 @@ am_magicseteditor_OBJECTS = ./src/util/version.$(OBJEXT) \
 	./src/script/script_manager.$(OBJEXT) \
 	./src/script/functions/english.$(OBJEXT) \
 	./src/script/functions/basic.$(OBJEXT) \
+	./src/script/functions/regex.$(OBJEXT) \
 	./src/script/functions/editor.$(OBJEXT) \
 	./src/script/functions/image.$(OBJEXT) \
 	./src/script/functions/export.$(OBJEXT) \
@@ -156,6 +157,7 @@ am_magicseteditor_OBJECTS = ./src/util/version.$(OBJEXT) \
 	./src/gui/set/keywords_panel.$(OBJEXT) \
 	./src/gui/set/panel.$(OBJEXT) \
 	./src/gui/set/stats_panel.$(OBJEXT) \
+	./src/gui/set/random_pack_panel.$(OBJEXT) \
 	./src/gui/set/window.$(OBJEXT) \
 	./src/gui/thumbnail_thread.$(OBJEXT) \
 	./src/gui/welcome_window.$(OBJEXT) \
@@ -349,6 +351,7 @@ magicseteditor_SOURCES = ./src/util/version.cpp \
 	./src/script/scriptable.cpp ./src/script/script_manager.cpp \
 	./src/script/functions/english.cpp \
 	./src/script/functions/basic.cpp \
+	./src/script/functions/regex.cpp \
 	./src/script/functions/editor.cpp \
 	./src/script/functions/image.cpp \
 	./src/script/functions/export.cpp ./src/script/context.cpp \
@@ -389,7 +392,8 @@ magicseteditor_SOURCES = ./src/util/version.cpp \
 	./src/gui/set/cards_panel.cpp ./src/gui/set/style_panel.cpp \
 	./src/gui/set/set_info_panel.cpp \
 	./src/gui/set/keywords_panel.cpp ./src/gui/set/panel.cpp \
-	./src/gui/set/stats_panel.cpp ./src/gui/set/window.cpp \
+	./src/gui/set/stats_panel.cpp \
+	./src/gui/set/random_pack_panel.cpp ./src/gui/set/window.cpp \
 	./src/gui/thumbnail_thread.cpp ./src/gui/welcome_window.cpp \
 	./src/gui/value/multiple_choice.cpp ./src/gui/value/symbol.cpp \
 	./src/gui/value/color.cpp ./src/gui/value/package_choice.cpp \
@@ -654,6 +658,9 @@ src/script/functions/$(DEPDIR)/$(am__dirstamp):
 ./src/script/functions/basic.$(OBJEXT):  \
 	src/script/functions/$(am__dirstamp) \
 	src/script/functions/$(DEPDIR)/$(am__dirstamp)
+./src/script/functions/regex.$(OBJEXT):  \
+	src/script/functions/$(am__dirstamp) \
+	src/script/functions/$(DEPDIR)/$(am__dirstamp)
 ./src/script/functions/editor.$(OBJEXT):  \
 	src/script/functions/$(am__dirstamp) \
 	src/script/functions/$(DEPDIR)/$(am__dirstamp)
@@ -853,6 +860,9 @@ src/gui/set/$(DEPDIR)/$(am__dirstamp):
 	src/gui/set/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/set/stats_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
 	src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/random_pack_panel.$(OBJEXT):  \
+	src/gui/set/$(am__dirstamp) \
+	src/gui/set/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/set/window.$(OBJEXT): src/gui/set/$(am__dirstamp) \
 	src/gui/set/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/thumbnail_thread.$(OBJEXT): src/gui/$(am__dirstamp) \
@@ -1042,6 +1052,7 @@ mostlyclean-compile:
 	-rm -f ./src/gui/set/cards_panel.$(OBJEXT)
 	-rm -f ./src/gui/set/keywords_panel.$(OBJEXT)
 	-rm -f ./src/gui/set/panel.$(OBJEXT)
+	-rm -f ./src/gui/set/random_pack_panel.$(OBJEXT)
 	-rm -f ./src/gui/set/set_info_panel.$(OBJEXT)
 	-rm -f ./src/gui/set/stats_panel.$(OBJEXT)
 	-rm -f ./src/gui/set/style_panel.$(OBJEXT)
@@ -1093,6 +1104,7 @@ mostlyclean-compile:
 	-rm -f ./src/script/functions/english.$(OBJEXT)
 	-rm -f ./src/script/functions/export.$(OBJEXT)
 	-rm -f ./src/script/functions/image.$(OBJEXT)
+	-rm -f ./src/script/functions/regex.$(OBJEXT)
 	-rm -f ./src/script/image.$(OBJEXT)
 	-rm -f ./src/script/parser.$(OBJEXT)
 	-rm -f ./src/script/script.$(OBJEXT)
@@ -1206,6 +1218,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./src/gui/set/$(DEPDIR)/cards_panel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/gui/set/$(DEPDIR)/keywords_panel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/gui/set/$(DEPDIR)/panel.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./src/gui/set/$(DEPDIR)/random_pack_panel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/gui/set/$(DEPDIR)/set_info_panel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/gui/set/$(DEPDIR)/stats_panel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/gui/set/$(DEPDIR)/style_panel.Po@am__quote@
@@ -1258,6 +1271,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./src/script/functions/$(DEPDIR)/english.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/script/functions/$(DEPDIR)/export.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/script/functions/$(DEPDIR)/image.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./src/script/functions/$(DEPDIR)/regex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/util/$(DEPDIR)/action_stack.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/util/$(DEPDIR)/age.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/util/$(DEPDIR)/alignment.Po@am__quote@
diff --git a/src/gui/control/graph.cpp b/src/gui/control/graph.cpp
index 6a88e373..6e304494 100644
--- a/src/gui/control/graph.cpp
+++ b/src/gui/control/graph.cpp
@@ -67,7 +67,7 @@ void GraphDataPre::splitList(size_t axis) {
 
 
 struct SmartLess{
-	inline operator () (const String& a, const String& b) const { return smart_less(a,b); }
+	inline bool operator () (const String& a, const String& b) const { return smart_less(a,b); }
 };
 DECLARE_TYPEOF(map<String COMMA UInt COMMA SmartLess>);
 
diff --git a/src/gui/set/random_pack_panel.hpp b/src/gui/set/random_pack_panel.hpp
index 6aa30d22..6f34f2fe 100644
--- a/src/gui/set/random_pack_panel.hpp
+++ b/src/gui/set/random_pack_panel.hpp
@@ -11,6 +11,7 @@
 
 #include <util/prec.hpp>
 #include <gui/set/panel.hpp>
+#include <wx/spinctrl.h>
 
 class CardViewer;
 class FilteredCardList;
diff --git a/src/script/script.hpp b/src/script/script.hpp
index 1e6b092b..138439ae 100644
--- a/src/script/script.hpp
+++ b/src/script/script.hpp
@@ -212,4 +212,3 @@ class Script : public ScriptValue {
 
 // ----------------------------------------------------------------------------- : EOF
 #endif
- 
\ No newline at end of file
diff --git a/src/util/atomic.hpp b/src/util/atomic.hpp
index f1957369..99d5edda 100644
--- a/src/util/atomic.hpp
+++ b/src/util/atomic.hpp
@@ -54,7 +54,7 @@
 	#define HAVE_FAST_ATOMIC
 	
 // ----------------------------------------------------------------------------- : AtomicInt : GCC
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && defined(__i486)
 	
 	/// An integer which is equivalent to an AtomicInt, but which doesn't support attomic operations
 	typedef unsigned int AtomicIntEquiv;
@@ -70,7 +70,7 @@
 			return __sync_add_and_fetch(&v,1);
 		}
 		inline AtomicInt operator -- () {
-			return __sync_add_and_fetch(&v,(AtomicIntEquiv)-1);
+			return __sync_sub_and_fetch(&v,1);
 		}
 	  private:
 		AtomicIntEquiv v;