minor refactorings in the State. first draft of the state handler scenarios