Fixed some stuff (variables), broke some stuff (variables).