diff --git a/etc/api b/etc/api
index fefafd4..e8a1270 160000
--- a/etc/api
+++ b/etc/api
@@ -1 +1 @@
-Subproject commit fefafd4923e824cb5a7f762c7e65d24cdc1f8d87
+Subproject commit e8a127093213a52b0f8513f72fe7c0566b786158
diff --git a/src/cmds/eval.lua b/src/cmds/eval.lua
index 60a9655..e430daf 100644
--- a/src/cmds/eval.lua
+++ b/src/cmds/eval.lua
@@ -39,11 +39,11 @@ return {
       api = owner and C.api or nil,
     }
     for k,v in pairs(env) do t[k] = v end
-    local e, err = load(C.api.unparseArgs(msg.args), 'eval', 't', t)
+    local e, err = load(table.concat(msg.args, ' '), 'eval', 't', t)
     xpcall(function()
       if err then error(err) end
       e = tostring(e() or '...')
     end, function(err) e = err end)
     C.api:send(msg, s .. '\n' .. e)
   end
-}
+}
\ No newline at end of file
diff --git a/src/cmds/reload.lua b/src/cmds/reload.lua
index 26b0665..e05e8b8 100644
--- a/src/cmds/reload.lua
+++ b/src/cmds/reload.lua
@@ -9,10 +9,10 @@ return {
     local path = 'src.'..cat..'.'..sub
     C.api:off(package.loaded[path])
     package.loaded[path] = nil
-    local suc, m = pcall(require, path)
+    local err, m = pcall(require, path)
 
-    if not suc then return C.api:reply(msg, 'Reload failed. ' .. m)
-    elseif cat == 'events' then C.api:on(sub, m)
+    if not err then return C.api:reply(msg, 'Reload failed. ' .. m)
+    elseif cat == 'events' then C.api:off(m); C.api:on(sub, m)
     elseif cat == 'cmds'   then C.cmds[sub] = m
     elseif cat == 'parts'  then m(C)
     end
diff --git a/src/events/command.lua b/src/events/command.lua
index c1d682e..38d9da9 100644
--- a/src/events/command.lua
+++ b/src/events/command.lua
@@ -15,7 +15,6 @@
     api:send(msg, C.locale:get('error', 'adm_cmd', l))
 
   else
-    if cmd.useQArgs then msg.args = api.parseArgs(api.unparseArgs(msg.args)) end
     msg.loc = C.locale:get('cmds', msg.cmd, l)
     local succ, err = pcall(cmd.run, C, msg, owner)
     if not succ then