(Itzik) Changing CmdIf to support Exp

General Exp
also ExpVar has now a "var" variable, for it's name