Small changes to the changes.

some small changes to that were causing to to crash with the new Variable naming system