Rescope curPat; rework oxygen calculation