diff --git a/scripts/keys.set b/scripts/keys.set
index c96d73e..8202965 100644
--- a/scripts/keys.set
+++ b/scripts/keys.set
@@ -1,7 +1,3 @@
-;unneeded keys
-#var badkeys {numpad2|numpad4|numpad5|numpad6|numpad8|numpad9|numpad/|numpad*|control-a|shift-pageup|shift-pagedown|control-pageup|control-pagedown}
-#ForAll @badkeys {#gunkey %i}
-;buffer keys
 #key {Alt-shift-right} {~buffer~ add}
 #key {alt-shift-left} {~buffer~ delete}
 #key {alt-left} {~@buffer~ backward}
@@ -25,7 +21,6 @@
 #key {alt-delete} {~@buffer~ clear}
 #Key ALT-SHIFT-DELETE {~@buffer~ clearall}
 #key {control-shift-enter} {~@sp-settings buffer sounds}
-;soundpack volume and behavior
 #key {f4} {~@sp-settings master volume}
 #key {f5} {~@sp-settings General volume}
 #key {f6} {~@sp-settings ambiance volume}
diff --git a/scripts/main.set b/scripts/main.set
index a118d53..53e106e 100644
--- a/scripts/main.set
+++ b/scripts/main.set
@@ -1,7 +1,6 @@
 ;core variables
 #var clientversion 17
-#var loadtask {keys|aliases|updator|soundpack}
-#ForAll @loadtask {#load @scpath/%i.set};
+#var loadtask {updator|keys|aliases};
 #var settings {rawpass|miscgags|shipgags|vehiclegags|activitygags|intromusic|vol|commandsinoutput|devmode|decchar|numpadon|AutomaticUpdate}
 #var speech "disabled"
 #if {%volume<100} {#pc 0 volume 100}
@@ -13,6 +12,7 @@
 #math num {@num + 1}};
 #close 6
 
+#ForAll @loadtask {#load @scpath/%i.set};
 
 #alarm 3 {#load @scpath/gagcreator.set};
 #alarm 4 {#load @scpath/pathupdator.set};
@@ -30,7 +30,25 @@
 #if {@shipgags = "enabled"} {#load {gags/shipgags.set}};
 #if {@miscgags = "enabled"} {#load {gags/miscgags.set}};
 };
-#if {@devmode="enabled"} {#load {@scpath/dev.set}};
+;#if {@devmode="enabled"} {#load {@scpath/dev.set}};
 #if {%defined(decchar)=0 or %length(@decchar)<1} {#var decchar .};
 #If {@numpadon="enabled"} {#load @scpath/numpad.set};
 #if {@commandsinoutput="enabled"} {#Configure DisplayCommandsInOutput true} {#Configure DisplayCommandsInOutput false};
+
+#trigger {$sphook &{action}:&{soundpath}:&{volume}:&{pitch}:&{pan}:&{id}} {
+#if {@action = "loop"} {#playloop {@sppath/@soundpath.wav} @volume; #var @id %playhandle};
+#if {@action = "playrec"} {#play {@sppath/@soundpath.wav} @volume; #var @id %playhandle};  
+#if {@action = "play"} {#play {@sppath/@soundpath.wav} @volume};
+#if {@pan <> "na"} {#math pan {@pan * 50}; #pc %playhandle pan @pan}; 
+#if {@pitch <> "na"} {#pc %playhandle frequency @pitch} {#pc %playhandle frequency 44100};
+#if {@action = "stop"} {#if {%defined(@id) = 1} {#pc %var(@id) stop}}; 
+#if {@action = "adjustsound"} {#if {%defined(@id) = 1} {
+  #if {@volume <> "na"} {#pc %var(@id) volume @volume}; 
+  #if {@pan <> "na"} {#pc %var(@id) pan @pan}; 
+  #if {@pitch <> "na"} {#pc %var(@id) frequency @pitch}
+}};
+#gagline all;
+#if {%playhandle=0} {#SetSpeech system stop;#say {Failed to play @soundpath.};
+#var faildsound {$sphook @action:@soundpath:@volume:@pitch:@pan:@id};
+#if {@AutomaticUpdate="enabled"} {FetchSound @soundpath}}}
+#trig {$buffer *} {#gagline all; #say %1 voiceonly}
\ No newline at end of file