Fix some states
Fix most of states
Fix events