Some bug fixes.  State machines are working.  Playback is still funny.