Updated expression folder and more variables

Updated new variables And if statements