Fixed some of the variables that weren't working.