Get rid of double quotes in UserVariables
Added if- and loop- references