fixing more variables