remove sln, work on state machine cleanup
mistaken adding of a shortcut
more fixes to the state machine