renamed variable
fixed more variables