Calib.C working again.  Wave fitting not yet added in.  More minor changes.