diff --git a/src-f90/cotrol.f90 b/src-f90/cotrol.f90
index 0850917ad42bf7dedc48b206c7f47430219e428d..76fc61be1e0cdbc93676eae373bd38f88eb6bc12 100644
--- a/src-f90/cotrol.f90
+++ b/src-f90/cotrol.f90
@@ -45,7 +45,7 @@ SUBROUTINE COTROL
   !
   IF (NRFP .EQ. 1) THEN
      !
-     PRINT *,' AT THE TIME PACCAGNELA ADDED THIS OPTION, '
+     PRINT *,' AT THE TIME PACCAGNELLA ADDED THIS OPTION, '
      PRINT *,' T**2 AND P WERE SPECIFIED AS POLYNOMIALS. '
      PRINT *,' SINCE THEN, T*TPRIME AND P-PRIME ARE GIVEN '
      PRINT *,' AS POLYNOMIALS AND THE REVERSED FIELD PINCH'
diff --git a/src-f90/isofun.f90 b/src-f90/isofun.f90
index c1bee754cb158e7662e0b8254efb09702a5102cd..9e014ce61a13f6deae87c786b5904dd00cea010b 100644
--- a/src-f90/isofun.f90
+++ b/src-f90/isofun.f90
@@ -314,6 +314,7 @@ SUBROUTINE ISOFUN(KN)
   IF (NTMF0.EQ.0) THEN
     !
     TMF(KN) = 0.5_RKIND
+    IF (NRFP.EQ.1) TMF(KN)=AT(3)**2 / 2._RKIND
     !
     DO J7=KN-1,1,-1
       !
diff --git a/src-f90/norept.f90 b/src-f90/norept.f90
index 6a28ac130a79df6f107f112a34fb81d67a2c368c..92316935d4d2d0917a4ff0b8878f964c4fad5ebe 100644
--- a/src-f90/norept.f90
+++ b/src-f90/norept.f90
@@ -228,7 +228,11 @@ SUBROUTINE NOREPT(KN,KSHIFT)
      !
      T0 = FCCCC0(TMF(1),TMF(2),TMF(3),TMF(4), &
           &                  PSIISO(1),PSIISO(2),PSIISO(3),PSIISO(4),SPSIM)
-     SCALE = 1._RKIND / T0
+     !IF (NTMF0 .EQ. 0) THEN
+     !   SCALE = 1._RKIND / TMF(KN)
+     !ELSE IF (NTMF0 .EQ. 1) THEN
+     !   SCALE = 1._RKIND / T0
+     !ENDIF
      CALL RVAR('SCALE           ',SCALE)
      CALL RVAR('T0              ',T0)
      CALL PRNORM(SCALE,KN)
diff --git a/src-f90/prfunc.f90 b/src-f90/prfunc.f90
index f76c40c476e123d37fbe9636e351ad91e0ebcc18..c4646250c8f1cc610456a940832aae9b47b03848 100644
--- a/src-f90/prfunc.f90
+++ b/src-f90/prfunc.f90
@@ -321,15 +321,21 @@ SUBROUTINE PRFUNC(KN,PP,PT)
   !
 !**********************************************************************
 !                                                                     *
-! REVERSED FIELD PINCH EQUILIBRIUM :                                  *
+! REVERSED FIELD PINCH EQUILIBRIUM                                    *
 !                                                                     *
-! COMPUTE TTPRIME(PSI) FOR THE RFP ASSUMING THE PROFILES              *
-! DETERMINED BY MU(0)=AT(1) , ALFA=AT(2) , Bz(1)=AT(3), g=AT(4)       *
-! MU=MU(0)*(1-g*psi**ALFA)=T'                                         *
-! ZS1 is normalized psi, the radius is normalized to the major radius *
-! The total poloidal flux is abs(psism)                               *
 !**********************************************************************
 !
+    IF (NFUNC .EQ. 2) THEN
+        !
+        !**********************************************************************
+        !                                                                     *
+        ! COMPUTE TTPRIME(PSI) FOR THE RFP ASSUMING THE PROFILES              *
+        ! DETERMINED BY MU(0)=AT(1) , ALFA=AT(2) , Bz(1)=AT(3), g=AT(4)       *
+        ! MU=MU(0)*(1-g*psi**ALFA)=T'                                         *
+        ! ZS1 is normalized psi, the radius is normalized to the major radius *
+        ! The total poloidal flux is abs(psism)                               *
+        !**********************************************************************
+        !
          ZALF  = AT(2)
          ZALF1 = ZALF + 1.
 !
@@ -348,7 +354,20 @@ SUBROUTINE PRFUNC(KN,PP,PT)
           ZTT     = AT(3)-AT(1)*(ZS1 - AT(4)/ZALF1*ZS1**ZALF1)
           PT(J31) = ZTT * AT(1) * (1. - AT(4)*ZS1**ZALF) /SPSIM
 !
-  31     CONTINUE
-!
-         RETURN
+          31     CONTINUE
+    ELSE IF (NFUNC .EQ. 4) THEN
+    !
+    !**********************************************************************
+    !                                                                     *
+    !  INTERPOLATE FUNC WITH CUBIC SPLINES ON RFUN VALUES (IF FUNC IS     *
+    !  GIVEN BY A SET OF POINTS)                                          *
+    !                                                                     *
+    !**********************************************************************
+    !
+        CALL PPSPLN(KN,PP,NPPF,FCSM,RFUN,D2RFUN,PT,ZDUMAR(1),0)
+    !
+
+    ENDIF
+    RETURN
+
 END SUBROUTINE PRFUNC
diff --git a/src-f90/qplacs.f90 b/src-f90/qplacs.f90
index e2fb02b5e2895df7bb6471070902d0ffdd4ff17b..78aa2d9e8233058ed8274d078a2c8d2a0b27b4fc 100644
--- a/src-f90/qplacs.f90
+++ b/src-f90/qplacs.f90
@@ -159,6 +159,8 @@ SUBROUTINE QPLACS
      !
   ELSE IF (NRFP .EQ. 1) THEN
      !
+     ! Only NCSCAL=4 for RFP
+     ! No re-scaling input profiles is presently possible (to do)
      DO J11=2,NPSI1
         ZQ(J11) = .5_RKIND * TMF(J11-1) * CIDQ(J11-1) / CPI
      END DO