fixed variable name issues