fixing state machines, consistency, but still problems
asdf