Add new variables to all necessary files and fix errors with previous new var addition