Changed analysis functions - in NewRig - better comments, removed cruft