diff --git a/config/command_parase_roles.lua b/config/command_parse_roles.lua
similarity index 79%
rename from config/command_parase_roles.lua
rename to config/command_parse_roles.lua
index e717cbea..82992a9c 100644
--- a/config/command_parase_roles.lua
+++ b/config/command_parse_roles.lua
@@ -4,7 +4,7 @@ local Roles = require 'expcore.roles'
 require 'config.command_parse_general'
 
 Commands.add_parse('role',function(input,player,reject)
-    if not role then return end
+    if not input then return end
     local role = Roles.get_role_from_any(input)
     if not role then
         return reject{'expcore-role.reject-role'}
@@ -17,8 +17,8 @@ Commands.add_parse('player-role',function(input,player,reject)
     local input_player = Commands.parse('player',input,player,reject)
     if not input_player then return end -- nil check
     local player_highest = Roles.get_player_highest_role(player)
-    local action_player_highest = Roles.get_player_highest_role(input_player)
-    if player_highest.index < action_player_highest.index then
+    local input_player_highest = Roles.get_player_highest_role(input_player)
+    if player_highest.index < input_player_highest.index then
         return input_player
     else
         return reject{'expcore-roles.reject-player-role'}
@@ -26,13 +26,13 @@ Commands.add_parse('player-role',function(input,player,reject)
 end)
 
 Commands.add_parse('player-role-online',function(input,player,reject)
-    local input_player = Commands.parse('player-rank',input,player,reject)
+    local input_player = Commands.parse('player-role',input,player,reject)
     if not input_player then return end -- nil check
     return Commands.parse('player-online',input_player,player,reject)
 end)
 
 Commands.add_parse('player-role-alive',function(input,player,reject)
-    local input_player = Commands.parse('player-rank',input,player,reject)
+    local input_player = Commands.parse('player-role',input,player,reject)
     if not input_player then return end -- nil check
     return Commands.parse('player-alive',input_player,player,reject)
 end)
\ No newline at end of file
diff --git a/expcore/commands.lua b/expcore/commands.lua
index efc45a87..3a3baeea 100644
--- a/expcore/commands.lua
+++ b/expcore/commands.lua
@@ -643,7 +643,7 @@ function Commands.run_command(command_event)
         if Commands.internal_error(success,command_data.name,param_parsed) then
             return command_log(player,command_data,'Internal Error: Param Parse Fail',params,command_event.parameter,param_parsed)
         end
-        if param_data.optional == true and param_parsed == nil then
+        if param_data.optional == true and raw_params[index] == nil then
             -- if it is optional and param is nil then it is set to default
             param_parsed = param_data.default
             if type(param_parsed) == 'function' then
diff --git a/expcore/roles.lua b/expcore/roles.lua
index f380c58b..284b9b01 100644
--- a/expcore/roles.lua
+++ b/expcore/roles.lua
@@ -104,7 +104,7 @@ function Roles.get_player_roles(player)
 end
 
 function Roles.get_player_highest_role(player)
-    local roles = Roles.get_player_roels(player)
+    local roles = Roles.get_player_roles(player)
     if not roles then return end
     local highest
     for _,role in pairs(roles) do
diff --git a/modules/commands/kill.lua b/modules/commands/kill.lua
index 5b4391eb..0c36e327 100644
--- a/modules/commands/kill.lua
+++ b/modules/commands/kill.lua
@@ -1,7 +1,7 @@
 local Commands = require 'expcore.commands'
 local Roles = require 'expcore.roles'
 require 'config.command_parse_general'
-require 'config.command_parse_role'
+require 'config.command_parse_roles'
 
 Commands.new_command('kill','Kills yourself or another player.')
 :add_param('player',true,'player-role-alive') -- the player to kill, must be alive to be valid
diff --git a/modules/commands/tag.lua b/modules/commands/tag.lua
index 177fbd4b..18c1f0e5 100644
--- a/modules/commands/tag.lua
+++ b/modules/commands/tag.lua
@@ -1,7 +1,7 @@
 local Commands = require 'expcore.commands'
 local Roles = require 'expcore.roles'
 require 'config.command_parse_general'
-require 'config.command_parse_role'
+require 'config.command_parse_roles'
 
 Commands.new_command('tag','Sets your player tag.')
 :add_param('tag',false,'string-max-length',20) -- new tag for your player max 20 char