straightened out the funky state transitions and controller cross
talk. cleaner? who know.