Lots of cleanup in circuit state.  Starting to move generation over to it.  Also began changing names to match torque wiki