diff --git a/CMakeLists.txt b/CMakeLists.txt
index d72bb5fef..a63a77016 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,7 @@ configure_file(
     IMMEDIATE @ONLY)
 
 if(NOT CMAKE_BUILD_TYPE)
-   set(CMAKE_BUILD_TYPE Release)
+   set(CMAKE_BUILD_TYPE Debug)
    message(STATUS "Build type not specified: defaulting to Release.")
 endif(NOT CMAKE_BUILD_TYPE)
 set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
diff --git a/lib/examples/pdsch_enodeb.c b/lib/examples/pdsch_enodeb.c
index 844e769a7..98ad78507 100644
--- a/lib/examples/pdsch_enodeb.c
+++ b/lib/examples/pdsch_enodeb.c
@@ -320,9 +320,9 @@ void base_init() {
     exit(-1);
   }
   srslte_ofdm_set_non_mbsfn_region(&ifft_mbsfn, 2);
-  
-  srslte_ofdm_set_normalize(&ifft, true);
   srslte_ofdm_set_normalize(&ifft_mbsfn, true);
+  srslte_ofdm_set_normalize(&ifft, true);
+  
   
   if (srslte_pbch_init(&pbch)) {
     fprintf(stderr, "Error creating PBCH object\n");
diff --git a/lib/src/phy/ch_estimation/chest_dl.c b/lib/src/phy/ch_estimation/chest_dl.c
index b5107f9ab..0f8ae8074 100644
--- a/lib/src/phy/ch_estimation/chest_dl.c
+++ b/lib/src/phy/ch_estimation/chest_dl.c
@@ -467,6 +467,8 @@ int srslte_chest_dl_estimate_port_mbsfn(srslte_chest_dl_t *q, cf_t *input, cf_t
   srslte_vec_prod_conj_ccc(q->pilot_recv_signal+(2*q->cell.nof_prb), q->mbsfn_refs[mbsfn_area_id]->pilots[port_id/2][sf_idx],
                            q->pilot_estimates+(2*q->cell.nof_prb), SRSLTE_REFSIGNAL_NUM_SF_MBSFN(q->cell.nof_prb, port_id)-(2*q->cell.nof_prb));
   
+
+  
   chest_interpolate_noise_est(q, input, ce, sf_idx, port_id, rxant_id, SRSLTE_SF_MBSFN);
       
   return 0;
diff --git a/lib/src/phy/ch_estimation/refsignal_dl.c b/lib/src/phy/ch_estimation/refsignal_dl.c
index 4de00039e..9adbc6c18 100644
--- a/lib/src/phy/ch_estimation/refsignal_dl.c
+++ b/lib/src/phy/ch_estimation/refsignal_dl.c
@@ -228,7 +228,8 @@ int srslte_refsignal_cs_init(srslte_refsignal_t * q, uint32_t max_prb)
 
   if (q != NULL)
   {
-    ret = SRSLTE_ERROR; 
+    ret = SRSLTE_ERROR;
+    bzero(q, sizeof(srslte_refsignal_t));
     for (int p=0;p<2;p++) {
       for (int i=0;i<SRSLTE_NSUBFRAMES_X_FRAME;i++) {
         q->pilots[p][i] = srslte_vec_malloc(sizeof(cf_t) * SRSLTE_REFSIGNAL_NUM_SF(max_prb, 2*p));
diff --git a/lib/src/phy/phch/pmch.c b/lib/src/phy/phch/pmch.c
index 4ce869b1c..99e40d50f 100644
--- a/lib/src/phy/phch/pmch.c
+++ b/lib/src/phy/phch/pmch.c
@@ -394,8 +394,10 @@ int srslte_pmch_decode_multi(srslte_pmch_t *q,
     * thus we don't need tot set it in thde LLRs normalization
     */
    
+    
+    
     srslte_demod_soft_demodulate_s(cfg->grant.mcs[0].mod, q->d, q->e, cfg->nbits[0].nof_re);
-   
+    
     /* descramble */
     srslte_scrambling_s_offset(&q->seqs[area_id]->seq[cfg->sf_idx], q->e, 0, cfg->nbits[0].nof_bits);
   
diff --git a/lib/src/phy/phch/ra.c b/lib/src/phy/phch/ra.c
index 418aa1260..be10c304c 100644
--- a/lib/src/phy/phch/ra.c
+++ b/lib/src/phy/phch/ra.c
@@ -466,6 +466,7 @@ int srslte_dl_fill_ra_mcs(srslte_ra_mcs_t *mcs, uint32_t nprb) {
     tbs = 0;
     i_tbs = 0;
   }
+  
   if (tbs == -1) {
     tbs = srslte_ra_tbs_from_idx(i_tbs, nprb);
     if (tbs >= 0) {
diff --git a/lib/src/phy/phch/test/CMakeLists.txt b/lib/src/phy/phch/test/CMakeLists.txt
index 832f18d1f..6e6b8c024 100644
--- a/lib/src/phy/phch/test/CMakeLists.txt
+++ b/lib/src/phy/phch/test/CMakeLists.txt
@@ -159,6 +159,19 @@ add_test(pdsch_test_multiplex2cw_p1_50  pdsch_test -x multiplex -a 2 -t 0 -p 1 -
 add_test(pdsch_test_multiplex2cw_p1_75  pdsch_test -x multiplex -a 2 -t 0 -p 1 -n 75)
 add_test(pdsch_test_multiplex2cw_p1_100 pdsch_test -x multiplex -a 2 -t 0 -p 1 -n 100)
 
+########################################################################
+# PMCH TEST  
+########################################################################
+
+
+add_executable(pmch_test pmch_test.c)
+target_link_libraries(pmch_test srslte_phy)
+
+add_test(pmch_test_qpsk pmch_test -m 6 -n 50)
+add_test(pmch_test_qam16 pmch_test -m 15 -n 100)
+add_test(pmch_test_qam64 pmch_test -m 25 -n 100)
+
+
 ########################################################################
 # FILE TEST  
 ########################################################################
@@ -178,11 +191,15 @@ target_link_libraries(pdcch_file_test srslte_phy)
 add_executable(pdsch_pdcch_file_test pdsch_pdcch_file_test.c)
 target_link_libraries(pdsch_pdcch_file_test srslte_phy)
 
+add_executable(pmch_file_test pmch_file_test.c)
+target_link_libraries(pmch_file_test srslte_phy)
+
 add_test(pbch_file_test pbch_file_test -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.1.92M.dat) 
 add_test(pcfich_file_test pcfich_file_test -c 150 -n 50 -p 2 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.10M.dat) 
 add_test(phich_file_test phich_file_test -c 150 -n 50 -p 2 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.10M.dat) 
 add_test(pdcch_file_test pdcch_file_test -c 1 -f 3 -n 6 -p 1 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.1.92M.amar.dat) 
-add_test(pdsch_pdcch_file_test pdsch_pdcch_file_test -c 1 -f 3 -n 6 -p 1 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.1.92M.amar.dat) 
+add_test(pdsch_pdcch_file_test pdsch_pdcch_file_test -c 1 -f 3 -n 6 -p 1 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.1.92M.amar.dat)
+add_test(pmch_file_test pmch_file_test  -i ${CMAKE_CURRENT_SOURCE_DIR}/pmch_100prbs_MCS2_SR0.bin) 
 
 ########################################################################
 # PUSCH TEST  
diff --git a/lib/src/phy/ue/ue_dl.c b/lib/src/phy/ue/ue_dl.c
index 583368b53..c4e2d3f6c 100644
--- a/lib/src/phy/ue/ue_dl.c
+++ b/lib/src/phy/ue/ue_dl.c
@@ -631,8 +631,7 @@ int srslte_ue_dl_decode_mbsfn(srslte_ue_dl_t * q,
       fprintf(stderr, "Error calling srslte_pmch_decode()\n");
     }
   }
-printf("q->pmch_pkts_total %d \n", q->pmch_pkts_total);
-printf("qq->pmch_pkt_errors %d \n", q->pmch_pkt_errors);
+
   q->pmch_pkts_total++;
 
   if (ret == SRSLTE_SUCCESS) {