Updated several variables, added new ones, and removed unecessary ones.