Update ExecuteCommand
Patch up /ex a little