Completed adding an arc type. Also now consistently only refer to arcs and states.