diff --git a/dvap_rptr.cpp b/dvap_rptr.cpp
index d93b77d..4581d9e 100644
--- a/dvap_rptr.cpp
+++ b/dvap_rptr.cpp
@@ -175,25 +175,10 @@ static const unsigned char DVP_RQST_START[] = {0x05, 0x00, 0x18, 0x00, 0x01};
 static const unsigned char DVP_REPL_START[] = {0x05, 0x00, 0x18, 0x00, 0x01};
 static const unsigned char DVP_RQST_STOP[] = {0x05, 0x00, 0x18, 0x00, 0x00};
 static const unsigned char DVP_REPL_STOP[] = {0x05, 0x00, 0x18, 0x00, 0x00};
-static const unsigned char DVP_HDR[] = {
-	0x2F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-static const unsigned char DVP_REPL_HDR[] = {
-	0x2F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
+static const unsigned char DVP_HDR[] = { 0x2F, 0xA0 };
+static const unsigned char DVP_REPL_HDR[] = { 0x2F, 0x60 };
 static const unsigned char DVP_REPL_PTT[] = {0x05, 0x20, 0x18, 0x01, 0x00};
-static unsigned char DVP_DAT[] = {
-	0x12, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
+static const unsigned char DVP_DAT[] = { 0x12, 0xC0 };
 static const unsigned char DVP_STS[] = {0x07, 0x20, 0x90, 0x00, 0x00, 0x00, 0x00};
 static const unsigned char DVP_ACK[] = {0x03, 0x60, 0x00};
 static const unsigned int MAX_REPL_CNT = 20;
@@ -250,10 +235,6 @@ static void ReadDVAPThread();
 static void RptrAckThread(SDVAP_ACK_ARG *parg);
 
 /*** BER stuff ***/
-static int ber_data[3];
-static int ber_errs;
-static int num_dv_frames;
-static int num_bit_errors;
 extern void dstar_dv_init();
 extern int dstar_dv_decode(const unsigned char *d, int data[3]);
 
@@ -262,38 +243,22 @@ static void calcPFCS(unsigned char *packet, unsigned char *pfcs)
 	unsigned short crc_dstar_ffff = 0xffff;
 	unsigned short tmp, short_c;
 	unsigned short crc_tabccitt[256] = {
-		0x0000,0x1189,0x2312,0x329b,0x4624,0x57ad,0x6536,0x74bf,
-		0x8c48,0x9dc1,0xaf5a,0xbed3,0xca6c,0xdbe5,0xe97e,0xf8f7,
-		0x1081,0x0108,0x3393,0x221a,0x56a5,0x472c,0x75b7,0x643e,
-		0x9cc9,0x8d40,0xbfdb,0xae52,0xdaed,0xcb64,0xf9ff,0xe876,
-		0x2102,0x308b,0x0210,0x1399,0x6726,0x76af,0x4434,0x55bd,
-		0xad4a,0xbcc3,0x8e58,0x9fd1,0xeb6e,0xfae7,0xc87c,0xd9f5,
-		0x3183,0x200a,0x1291,0x0318,0x77a7,0x662e,0x54b5,0x453c,
-		0xbdcb,0xac42,0x9ed9,0x8f50,0xfbef,0xea66,0xd8fd,0xc974,
-		0x4204,0x538d,0x6116,0x709f,0x0420,0x15a9,0x2732,0x36bb,
-		0xce4c,0xdfc5,0xed5e,0xfcd7,0x8868,0x99e1,0xab7a,0xbaf3,
-		0x5285,0x430c,0x7197,0x601e,0x14a1,0x0528,0x37b3,0x263a,
-		0xdecd,0xcf44,0xfddf,0xec56,0x98e9,0x8960,0xbbfb,0xaa72,
-		0x6306,0x728f,0x4014,0x519d,0x2522,0x34ab,0x0630,0x17b9,
-		0xef4e,0xfec7,0xcc5c,0xddd5,0xa96a,0xb8e3,0x8a78,0x9bf1,
-		0x7387,0x620e,0x5095,0x411c,0x35a3,0x242a,0x16b1,0x0738,
-		0xffcf,0xee46,0xdcdd,0xcd54,0xb9eb,0xa862,0x9af9,0x8b70,
-		0x8408,0x9581,0xa71a,0xb693,0xc22c,0xd3a5,0xe13e,0xf0b7,
-		0x0840,0x19c9,0x2b52,0x3adb,0x4e64,0x5fed,0x6d76,0x7cff,
-		0x9489,0x8500,0xb79b,0xa612,0xd2ad,0xc324,0xf1bf,0xe036,
-		0x18c1,0x0948,0x3bd3,0x2a5a,0x5ee5,0x4f6c,0x7df7,0x6c7e,
-		0xa50a,0xb483,0x8618,0x9791,0xe32e,0xf2a7,0xc03c,0xd1b5,
-		0x2942,0x38cb,0x0a50,0x1bd9,0x6f66,0x7eef,0x4c74,0x5dfd,
-		0xb58b,0xa402,0x9699,0x8710,0xf3af,0xe226,0xd0bd,0xc134,
-		0x39c3,0x284a,0x1ad1,0x0b58,0x7fe7,0x6e6e,0x5cf5,0x4d7c,
-		0xc60c,0xd785,0xe51e,0xf497,0x8028,0x91a1,0xa33a,0xb2b3,
-		0x4a44,0x5bcd,0x6956,0x78df,0x0c60,0x1de9,0x2f72,0x3efb,
-		0xd68d,0xc704,0xf59f,0xe416,0x90a9,0x8120,0xb3bb,0xa232,
-		0x5ac5,0x4b4c,0x79d7,0x685e,0x1ce1,0x0d68,0x3ff3,0x2e7a,
-		0xe70e,0xf687,0xc41c,0xd595,0xa12a,0xb0a3,0x8238,0x93b1,
-		0x6b46,0x7acf,0x4854,0x59dd,0x2d62,0x3ceb,0x0e70,0x1ff9,
-		0xf78f,0xe606,0xd49d,0xc514,0xb1ab,0xa022,0x92b9,0x8330,
-		0x7bc7,0x6a4e,0x58d5,0x495c,0x3de3,0x2c6a,0x1ef1,0x0f78
+		0x0000,0x1189,0x2312,0x329b,0x4624,0x57ad,0x6536,0x74bf,0x8c48,0x9dc1,0xaf5a,0xbed3,0xca6c,0xdbe5,0xe97e,0xf8f7,
+		0x1081,0x0108,0x3393,0x221a,0x56a5,0x472c,0x75b7,0x643e,0x9cc9,0x8d40,0xbfdb,0xae52,0xdaed,0xcb64,0xf9ff,0xe876,
+		0x2102,0x308b,0x0210,0x1399,0x6726,0x76af,0x4434,0x55bd,0xad4a,0xbcc3,0x8e58,0x9fd1,0xeb6e,0xfae7,0xc87c,0xd9f5,
+		0x3183,0x200a,0x1291,0x0318,0x77a7,0x662e,0x54b5,0x453c,0xbdcb,0xac42,0x9ed9,0x8f50,0xfbef,0xea66,0xd8fd,0xc974,
+		0x4204,0x538d,0x6116,0x709f,0x0420,0x15a9,0x2732,0x36bb,0xce4c,0xdfc5,0xed5e,0xfcd7,0x8868,0x99e1,0xab7a,0xbaf3,
+		0x5285,0x430c,0x7197,0x601e,0x14a1,0x0528,0x37b3,0x263a,0xdecd,0xcf44,0xfddf,0xec56,0x98e9,0x8960,0xbbfb,0xaa72,
+		0x6306,0x728f,0x4014,0x519d,0x2522,0x34ab,0x0630,0x17b9,0xef4e,0xfec7,0xcc5c,0xddd5,0xa96a,0xb8e3,0x8a78,0x9bf1,
+		0x7387,0x620e,0x5095,0x411c,0x35a3,0x242a,0x16b1,0x0738,0xffcf,0xee46,0xdcdd,0xcd54,0xb9eb,0xa862,0x9af9,0x8b70,
+		0x8408,0x9581,0xa71a,0xb693,0xc22c,0xd3a5,0xe13e,0xf0b7,0x0840,0x19c9,0x2b52,0x3adb,0x4e64,0x5fed,0x6d76,0x7cff,
+		0x9489,0x8500,0xb79b,0xa612,0xd2ad,0xc324,0xf1bf,0xe036,0x18c1,0x0948,0x3bd3,0x2a5a,0x5ee5,0x4f6c,0x7df7,0x6c7e,
+		0xa50a,0xb483,0x8618,0x9791,0xe32e,0xf2a7,0xc03c,0xd1b5,0x2942,0x38cb,0x0a50,0x1bd9,0x6f66,0x7eef,0x4c74,0x5dfd,
+		0xb58b,0xa402,0x9699,0x8710,0xf3af,0xe226,0xd0bd,0xc134,0x39c3,0x284a,0x1ad1,0x0b58,0x7fe7,0x6e6e,0x5cf5,0x4d7c,
+		0xc60c,0xd785,0xe51e,0xf497,0x8028,0x91a1,0xa33a,0xb2b3,0x4a44,0x5bcd,0x6956,0x78df,0x0c60,0x1de9,0x2f72,0x3efb,
+		0xd68d,0xc704,0xf59f,0xe416,0x90a9,0x8120,0xb3bb,0xa232,0x5ac5,0x4b4c,0x79d7,0x685e,0x1ce1,0x0d68,0x3ff3,0x2e7a,
+		0xe70e,0xf687,0xc41c,0xd595,0xa12a,0xb0a3,0x8238,0x93b1,0x6b46,0x7acf,0x4854,0x59dd,0x2d62,0x3ceb,0x0e70,0x1ff9,
+		0xf78f,0xe606,0xd49d,0xc514,0xb1ab,0xa022,0x92b9,0x8330,0x7bc7,0x6a4e,0x58d5,0x495c,0x3de3,0x2c6a,0x1ef1,0x0f78
 	};
 
 	for (int i = 0; i < 39 ; i++) {
@@ -1679,14 +1644,14 @@ static void ReadDVAPThread()
 	bool ok = true;
 	int i = 0;
 	u_int16_t streamid_raw = 0;
-	short int sequence = 0x00;
+	short int sequence = 0;
 	char mycall[8];
 	short int status_cntr = 3000;
 	char temp_yrcall[CALL_SIZE + 1];
 	char *temp_ptr = NULL;
 
-	num_dv_frames = 0;
-	num_bit_errors = 0;
+	int num_dv_frames = 0;
+	int num_bit_errors = 0;
 
 	act.sa_handler = sig_catch;
 	sigemptyset(&act.sa_mask);
@@ -1913,7 +1878,7 @@ static void ReadDVAPThread()
 				streamid_raw = (rand_r(&aseed) % 65535U) + 1U;
 				net_buf.myicm.streamid = streamid_raw;
 				net_buf.myicm.ctrl = 0x80;
-				sequence = 0x00;
+				sequence = 0;
 				calcPFCS((unsigned char *)&(net_buf.hdr), net_buf.hdr.pfcs);
 				sendto(insock, (char *)&net_buf, 58, 0, (struct sockaddr *)&outaddr, sizeof(outaddr));
 				C_COUNTER ++;
@@ -1940,28 +1905,28 @@ static void ReadDVAPThread()
 				memcpy(&net_buf.vasd, dvp_buf + 6, 12);
 				sendto(insock, (char *)&net_buf, 29, 0, (struct sockaddr *)&outaddr, sizeof(outaddr));
 
-				ber_errs = dstar_dv_decode((unsigned char *)&net_buf + 17, ber_data);
+				int ber_data[3];
+				int ber_errs = dstar_dv_decode(net_buf.vasd.voice, ber_data);
 				if (ber_data[0] != 0xf85) {
 					num_bit_errors += ber_errs;
-					num_dv_frames ++;
+					num_dv_frames++;
 				}
 
-				C_COUNTER ++;
+				C_COUNTER++;
 				if (sequence > 0x14)
-					sequence = 0x00;
+					sequence = 0;
 
 				// local RF user still talking, update timer
 				time(&last_RF_time);
 				if (the_end) {
 					// local RF user stopped talking
 					dvap_busy = false;
-					traceit("End of dvap audio,  ber=%.02f\n",
-					        (num_dv_frames == 0)?0.00:100.00 * ((float)num_bit_errors / (float)(num_dv_frames * 24.00)) );
+					static SDVAP_ACK_ARG dvap_ack_arg;
+					dvap_ack_arg.ber = (num_dv_frames==0) ? 0.f : 100.f * (float)num_bit_errors / (float)(num_dv_frames * 24);
+					traceit("End of dvap audio,  ber=%.02f\n", dvap_ack_arg.ber);
 
 					if (RPTR_ACK && !busy20000) {
-						static SDVAP_ACK_ARG dvap_ack_arg;
 						memcpy(dvap_ack_arg.mycall, mycall, 8);
-						dvap_ack_arg.ber = (num_dv_frames==0) ? 0.00 : 100.00*((float)num_bit_errors/(float)(num_dv_frames*24.00));
 						try {
 							std::async(std::launch::async, RptrAckThread, &dvap_ack_arg);
 						} catch (const std::exception &e) {
@@ -1972,7 +1937,7 @@ static void ReadDVAPThread()
 			}
 		}
 		usleep(1000);
-		status_cntr --;
+		status_cntr--;
 		if (status_cntr < 0)
 			break;
 	}