diff --git a/plot.c b/plot.c
index 5a63cec..1eb69ce 100644
--- a/plot.c
+++ b/plot.c
@@ -1617,7 +1617,11 @@ static void cell_draw_marker_info(int x0, int y0)
 //        j = 1;
       int xpos = 1 + (j%2)*(WIDTH/2) + CELLOFFSETX - x0;
       int ypos = 1 + (j/2)*(16) - y0;
-      cell_printf(xpos, ypos, FONT_b"GAIN: %4.1fdB   NF: %4.1f", nf_gain, mNF);
+      if (nf_gain != 0) {
+        cell_printf(xpos, ypos, FONT_b"GAIN: %4.1fdB   NF: %4.1f", nf_gain, mNF);
+      } else {
+        cell_printf(xpos, ypos, FONT_b"TINYSA NF: %4.1f", mNF);
+      }
       break;
 #endif
     } else
diff --git a/si4468.c b/si4468.c
index 3a4c478..82287c9 100644
--- a/si4468.c
+++ b/si4468.c
@@ -1523,15 +1523,15 @@ typedef struct {
 static const RBW_t RBW_choices[] =
 {
 // BW register    corr  freq
- {SI4463_RBW_02kHz, 16,3,42},
- {SI4463_RBW_1kHz,  20,10,29},
- {SI4463_RBW_3kHz,  15,30,28},
- {SI4463_RBW_10kHz, 5,100,26},
- {SI4463_RBW_30kHz, 11,300,22},
- {SI4463_RBW_100kHz,9,1000,19},
- {SI4463_RBW_300kHz,8,3000,5},
- {SI4463_RBW_600kHz,9,6000,-1},
- {SI4463_RBW_850kHz,19,8500,-9},
+ {SI4463_RBW_02kHz, 16,3,22},
+ {SI4463_RBW_1kHz,  20,10,9},
+ {SI4463_RBW_3kHz,  15,30,8},
+ {SI4463_RBW_10kHz, 5,100,6},
+ {SI4463_RBW_30kHz, 11,300,2},
+ {SI4463_RBW_100kHz,9,1000,-1},
+ {SI4463_RBW_300kHz,8,3000,-15},
+ {SI4463_RBW_600kHz,9,6000,-21},
+ {SI4463_RBW_850kHz,19,8500,-29},
 };
 
 const uint8_t SI4432_RBW_count = ((int)(sizeof(RBW_choices)/sizeof(RBW_t)));