Fixed up some cross refs. Rewrote call state definition