Correct misreferenced _states, initial work on a stop() function