Made some tweaks to the state machines after test

after testing through the HMI using the forcing