Fixes

- Changed the name of a couple of variables to avoid redoing the whole diagram.
- Added the state variable to the Case.