More done on the stateClasses.

Fixt some event s oin the classes