Improved state machine transition tables

The state machine transition tables had a few problems with them in the
initial design.  Hopefully this update will fix the issues.