diff --git a/lib/src/phy/dft/ofdm.c b/lib/src/phy/dft/ofdm.c
index 41469e50a..1b1856873 100644
--- a/lib/src/phy/dft/ofdm.c
+++ b/lib/src/phy/dft/ofdm.c
@@ -72,7 +72,7 @@ static int ofdm_init_mbsfn_(srsran_ofdm_t* q, srsran_ofdm_cfg_t* cfg, srsran_dft
   if (q->fft_plan.size) {
     // Replan if it was initialised previously
     if (srsran_dft_replan(&q->fft_plan, q->cfg.symbol_sz)) {
-      ERROR("Reeplaning DFT plan");
+      ERROR("Replanning DFT plan");
       return SRSRAN_ERROR;
     }
   } else {
@@ -85,7 +85,7 @@ static int ofdm_init_mbsfn_(srsran_ofdm_t* q, srsran_ofdm_cfg_t* cfg, srsran_dft
 
   // Reallocate temporal buffer only if the new number of resource blocks is bigger than initial
   if (q->cfg.nof_prb > q->max_prb) {
-    // Free before reallocating if allocted
+    // Free before reallocating if allocated
     if (q->tmp) {
       free(q->tmp);
       free(q->shift_buffer);
@@ -553,7 +553,7 @@ void srsran_ofdm_rx_sf_ng(srsran_ofdm_t* q, cf_t* input, cf_t* output)
 }
 
 /* Transforms input OFDM symbols into output samples.
- * Performs FFT on a each symbol and adds CP.
+ * Performs the FFT on each symbol and adds CP.
  */
 static void ofdm_tx_slot(srsran_ofdm_t* q, int slot_in_sf)
 {
diff --git a/lib/src/phy/gnb/gnb_dl.c b/lib/src/phy/gnb/gnb_dl.c
index 0c025fc45..a69e7291e 100644
--- a/lib/src/phy/gnb/gnb_dl.c
+++ b/lib/src/phy/gnb/gnb_dl.c
@@ -61,7 +61,7 @@ int srsran_gnb_dl_init(srsran_gnb_dl_t* q, cf_t* output[SRSRAN_MAX_PORTS], const
     return SRSRAN_ERROR;
   }
 
-  // Check symbol size is vlid
+  // Check symbol size is valid
   int symbol_sz = srsran_symbol_sz_from_srate(args->srate_hz, args->scs);
   if (symbol_sz <= 0) {
     ERROR("Error calculating symbol size from sampling rate of %.2f MHz and subcarrier spacing %s",
diff --git a/lib/src/phy/phch/pusch_nr.c b/lib/src/phy/phch/pusch_nr.c
index e4b1bda7b..6ffbb3e54 100644
--- a/lib/src/phy/phch/pusch_nr.c
+++ b/lib/src/phy/phch/pusch_nr.c
@@ -725,7 +725,7 @@ int srsran_pusch_nr_encode(srsran_pusch_nr_t*            q,
     return SRSRAN_ERROR;
   }
 
-  // 7.3.1.1 and 7.3.1.2
+  // 6.3.1.1 and 6.3.1.2
   uint32_t nof_cw = 0;
   for (uint32_t tb = 0; tb < SRSRAN_MAX_TB; tb++) {
     nof_cw += grant->tb[tb].enabled ? 1 : 0;
@@ -737,20 +737,23 @@ int srsran_pusch_nr_encode(srsran_pusch_nr_t*            q,
     }
   }
 
-  // 7.3.1.3 Layer mapping
+  // 6.3.1.3 Layer mapping
   cf_t** x = q->d;
   if (grant->nof_layers > 1) {
     x = q->x;
     srsran_layermap_nr(q->d, nof_cw, x, grant->nof_layers, grant->nof_layers);
   }
 
-  // 7.3.1.4 Antenna port mapping
+  // 6.3.1.4 Transform precoding
   // ... Not implemented
 
-  // 7.3.1.5 Mapping to virtual resource blocks
+  // 6.3.1.5 Precoding
   // ... Not implemented
 
-  // 7.3.1.6 Mapping from virtual to physical resource blocks
+  // 6.3.1.6 Mapping to virtual resource blocks
+  // ... Not implemented
+
+  // 6.3.1.7 Mapping from virtual to physical resource blocks
   int n = pusch_nr_put(q, cfg, grant, x[0], sf_symbols[0]);
   if (n < SRSRAN_SUCCESS) {
     ERROR("Putting NR PUSCH resources");