StateTransitionLogic.v to StateLogic.v; Some fixes