diff --git a/serverscript b/serverscript
index 75452049..9e9cc711 100755
--- a/serverscript
+++ b/serverscript
@@ -3,4 +3,4 @@
 screen -d -m -S "Server" bundle exec rails s
 screen -d -m -S "Solr" bundle exec rake sunspot:solr:run
 screen -d -m -S "Redis" redis-server
-bundle exec resque-pool --daemon --environment development
+bundle exec resque-pool --daemon --environment development --term-graceful
diff --git a/turnoffserver b/turnoffserver
index a9dc0e22..6817e81f 100755
--- a/turnoffserver
+++ b/turnoffserver
@@ -2,6 +2,4 @@
 screen -X -S Server quit
 screen -X -S Solr quit
 killall -9 redis-server
-screen -X -S Resque-worker quit
-
-  
+ps aux | grep [r]esque-pool | kill -9 `awk '{print $2}'` # ugly :D