fixed issues with variable names