(re)add conditionals
correction of variable names