Changes to variable names
Final changes to code.  Adding supplementary figures code as well