Fix some Cygwin64 Build Script Issues and Instructions; #324

Use sed to replace line in ITPP CmakeLists.txt file to update the cmake_minimum_required to an acceptible version for newer cmake; Include SIMD Math Libraries libopenblas, liblapack-devel, libfftw3-devel for Cygwin64; If perceived performance issues arise, may consider removing the Math Libraries above from Cygwin64 install script
Misc Fixes; #324
2026-11-13 01:07:24 -05:00 · 2025-12-14 19:51:34 -05:00 · 2025-12-12 21:51:37 -05:00 · 2025-11-16 14:30:52 -05:00 · 2025-11-10 20:52:35 -05:00 · 2025-11-10 20:32:05 -05:00
132 changed files with 27276 additions and 17023 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,25 +10,25 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
 set(CURSES_NEED_NCURSES TRUE)
 set(CURSES_NEED_WIDE TRUE)

-#use cmake option -DAERO=ON to enable Aero Builds (OSS support and specific tweaks)
-option(AERO
-    "Build for Aero Environments (Cygwin)" OFF)
-if (AERO)
-    add_definitions(-DAERO_BUILD) 
-endif ()
-
-#use cmake option -DCOLORS=OFF to disable color output
+#use cmake option -DCOLORS=OFF to disable color output (ncurses)
 option(COLORS
    "Build with Colors Enabled" ON)
 if (COLORS)
-    add_definitions(-DPRETTY_COLORS) 
+    add_definitions(-DPRETTY_COLORS)
+endif ()
+
+#use cmake option -DCOLORSLOGS=OFF to disable color output (terminal/logs)
+option(COLORSLOGS
+    "Build with Colors Enabled" ON)
+if (COLORSLOGS)
+    add_definitions(-DPRETTY_COLORS_LOGS)
 endif ()

 #use cmake option -DPVC=ON to enable Provoice Conventional Frame Sync
 option(PVC
    "Build with Provoice Conventional Frame Sync Enabled" OFF)
 if (PVC)
-    add_definitions(-DPVCONVENTIONAL) 
+    add_definitions(-DPVCONVENTIONAL)
 endif ()


@@ -36,14 +36,14 @@ endif ()
 option(LZ
    "Build with new LimaZulu Requested NXDN Tweaks Enabled" OFF)
 if (LZ)
-    add_definitions(-DLIMAZULUTWEAKS) 
+    add_definitions(-DLIMAZULUTWEAKS)
 endif ()

 #use cmake option -DSID=ON to enable P25p1 Soft ID decoding -- Experimental
 option(SID
    "Build with P25p1 LSD/Soft ID Enabled" OFF)
 if (SID)
-    add_definitions(-DSOFTID) 
+    add_definitions(-DSOFTID)
 endif ()


@@ -54,12 +54,12 @@ find_package(LibSndFile REQUIRED)
 find_package(MBE REQUIRED)
 find_package(ITPP REQUIRED)
 find_package(RTLSDR)
-find_package(Curses REQUIRED) 
+find_package(Curses REQUIRED)
 find_package(PulseAudio REQUIRED)
 find_package(CODEC2)

-include_directories(SYSTEM ${LIBSNDFILE_INCLUDE_DIR} ${MBE_INCLUDE_DIR} ${ITPP_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIRS} ${CURSES_INCLUDE_DIR})
-set(LIBS ${MBE_LIBRARY} ${LIBSNDFILE_LIBRARY} ${ITPP_LIBRARY} ${PULSEAUDIO_SIMPLE_LIBRARY} ${PULSEAUDIO_LIBRARY} ${CURSES_LIBRARY})
+include_directories(SYSTEM ${LIBSNDFILE_INCLUDE_DIR} ${MBE_INCLUDE_DIR} ${ITPP_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIRS} ${CURSES_INCLUDE_DIRS})
+set(LIBS ${MBE_LIBRARY} ${LIBSNDFILE_LIBRARY} ${ITPP_LIBRARY} ${PULSEAUDIO_SIMPLE_LIBRARY} ${PULSEAUDIO_LIBRARY} ${CURSES_LIBRARIES})

 if(RTLSDR_FOUND)
    find_package(Threads)
--- a/README.md
+++ b/README.md
@@ -1,8 +1,7 @@

 # Digital Speech Decoder - Florida Man Edition

-DSD-FME is an evolution of the original DSD project from 'DSD Author' using the base code of [szechyjs](https://github.com/szechyjs/dsd "szechyjs"), some code and ideas from [LouisErigHerve](https://github.com/LouisErigHerve/dsd "LouisErigHerve"), [Boatbod OP25](https://github.com/boatbod/op25 "Boatbod OP25") and 
-[Osmocom OP25](https://gitea.osmocom.org/op25/op25 "Osmocom OP25"), along with other snippets of code, information, and inspirations from other projects including [DSDcc](https://github.com/f4exb/dsdcc "DSDcc"), [SDRTRunk](https://github.com/DSheirer/sdrtrunk "SDRTrunk"), [MMDVMHost](https://github.com/g4klx/MMDVMHost "MMDVMHost"), [LFSR](https://github.com/mattames/LFSR "LFSR"), [OK-DMRlib](https://github.com/OK-DMR/ok-dmrlib "OK-DMRlib"), and [EZPWD-Reed-Solomon](https://github.com/pjkundert/ezpwd-reed-solomon "EZPWD"), Eric Cottrell, SP5WWP and others. Finally, this is all brought together with original code to extend the fuctionality and add new features including NCurses Terminal and Menu system, Pulse Audio, TCP Direct Link Audio, RIGCTL, Trunking Features, LRRP/GPS Mapping, P25 Phase 2, EDACS, YSF, M17, OP25 Capture Bin compatability, etc. DSD-FME is primarily focused with Linux Desktop users in mind, so please understand that this version may not compile, compile easily, or run correctly in other environments.
+DSD-FME is an evolution of the original DSD project from 'DSD Author' using the base code of [szechyjs](https://github.com/szechyjs/dsd "szechyjs"), some code and ideas from [LouisErigHerve](https://github.com/LouisErigHerve/dsd "LouisErigHerve"), [Boatbod OP25](https://github.com/boatbod/op25 "Boatbod OP25") and [Osmocom OP25](https://gitea.osmocom.org/op25/op25 "Osmocom OP25"), along with other snippets of code, information, and inspirations from other projects including [DSDcc](https://github.com/f4exb/dsdcc "DSDcc"), [SDRTRunk](https://github.com/DSheirer/sdrtrunk "SDRTrunk"), [MMDVMHost](https://github.com/g4klx/MMDVMHost "MMDVMHost"), [LFSR](https://github.com/mattames/LFSR "LFSR"), [OK-DMRlib](https://github.com/OK-DMR/ok-dmrlib "OK-DMRlib"), and [EZPWD-Reed-Solomon](https://github.com/pjkundert/ezpwd-reed-solomon "EZPWD"), Eric Cottrell, SP5WWP and others. Finally, this is all brought together with original code to extend the fuctionality and add new features including NCurses Terminal and Menu system, Pulse Audio, TCP Direct Link Audio, RIGCTL, Trunking Features, LRRP/GPS Mapping, P25 Phase 2, EDACS, YSF, M17, OP25 Capture Bin compatability, etc. DSD-FME is primarily focused with Linux Desktop users in mind, so please understand that this version may not compile, compile easily, or run correctly in other environments.

 This project wouldn't be possible without a few good people providing me plenty of sample audio files to run over and over again. Special thanks to jurek1111, KrisMar, noamlivne, racingfan360, iScottyBotty, LimaZulu, Forts, thewraithe2008, RayAir, Cretu, ilyacodes, and others for the many hours of wav samples and information provided by them. Most importantly, HRH17, whose insight, information, samples, and willingness to let me remote into a computer half-way across the globe in order to test trunking features are what make DSD-FME what it has become. I'd also like to thank mrscanner2008 for providing an additional remote where additional NXDN Type-C, 'Idas' Type-D, and XPT decoding and trunking could be sorted out. Thanks to volo-zyko for cleaning up a lot of code. Thank you everybody.

--- a/cmake/git_revision.cmake.in
+++ b/cmake/git_revision.cmake.in
@@ -1,4 +1,4 @@
-# 
+#
 # Internal file for GetGitRevisionDescription.cmake
 #
 # Requires CMake 2.6 or newer (uses the 'function' command)
--- a/cyg_portable.sh
+++ b/cyg_portable.sh
@@ -0,0 +1,249 @@
+#! /bin/bash
+#
+cdir=$(pwd)
+clear
+printf "DSD-FME Digital Speech Decoder - Florida Man Edition Portable Cygwin Creator\n"
+printf "Only use this in a Cygwin64 Environment. Will not work in a Linux Environment!\n"
+read -p "Do you want to make a portable copy? y/N " RELEASE
+RELEASE=$(printf "$RELEASE"|tr '[:upper:]' '[:lower:]')
+if [ "$RELEASE" = "y" ]; then
+
+  printf "Copying files to dsd-fme-portable folder and making zip file. Please wait!\n"
+  cd ~
+
+  #create a dsd-fme-portable folder and copy all the needed items for a portable release version
+  mkdir dsd-fme-portable
+  cd dsd-fme-portable
+  #all of these folders may not be necessary
+  mkdir sourcecode
+  mkdir bin
+  mkdir dev
+  cd dev
+  mkdir shm
+  cd ..
+  mkdir dsd-fme
+  mkdir logs
+  mkdir WAV
+  mkdir etc
+  mkdir home
+  mkdir lib
+  mkdir tmp
+  mkdir usr
+  cd usr
+  mkdir share
+  cd share
+  mkdir terminfo
+  cd ~
+
+  #start copying things
+
+  #terminfo is needed for ncurses
+  cp -r /usr/share/terminfo/* dsd-fme-portable/usr/share/terminfo
+
+  #copy required items from the root bin folder to release bin folder
+  cp /bin/ls.exe dsd-fme-portable/bin/
+  cp /bin/bash.exe dsd-fme-portable/bin/
+  cp /bin/ncurses6-config dsd-fme-portable/bin/
+  cp /bin/ncursesw6-config dsd-fme-portable/bin/
+  cp /bin/pacat.exe dsd-fme-portable/bin/
+  cp /bin/pactl.exe dsd-fme-portable/bin/
+  cp /bin/padsp dsd-fme-portable/bin/
+  cp /bin/pamon dsd-fme-portable/bin/
+  cp /bin/paplay dsd-fme-portable/bin/
+  cp /bin/parec dsd-fme-portable/bin/
+  cp /bin/parecord dsd-fme-portable/bin/
+  cp /bin/pulseaudio.exe dsd-fme-portable/bin/
+  cp /bin/tty.exe dsd-fme-portable/bin/
+
+  #start copying things from the etc folder
+  cp -r /etc/pulse/ dsd-fme-portable/etc/
+
+  #start copying things to the lib folder
+  cp -r /lib/pulseaudio/ dsd-fme-portable/lib/
+
+  #support for LAPACK, BLAS, and FFTW3 (SIMD math libraries and dependencies)
+  cp /lib/lapack/* dsd-fme-portable/dsd-fme/
+  cp /bin/cyggfortran* dsd-fme-portable/dsd-fme/
+
+  #start copying things into the dsd-fme folder
+  cp dsd-fme/build/dsd-fme.exe dsd-fme-portable/dsd-fme/
+  cp -r dsd-fme/examples dsd-fme-portable/dsd-fme/
+  cp .bash_profile dsd-fme-portable/dsd-fme/
+  cp .bashrc dsd-fme-portable/dsd-fme/
+  cp .inputrc dsd-fme-portable/dsd-fme/
+  cp .profile dsd-fme-portable/dsd-fme/
+
+  #move (cut) the bat files to the portable folder root and delete the other ones so users won't get confused
+  mv dsd-fme-portable/dsd-fme/examples/cygwin_bat/*.bat dsd-fme-portable/
+  mv dsd-fme-portable/dsd-fme/examples/cygwin_bat/example_options.txt dsd-fme-portable/
+  mv dsd-fme-portable/dsd-fme/examples/cygwin_bat/complete_usage_options.txt dsd-fme-portable/
+  rm -rf dsd-fme-portable/dsd-fme/examples/cygwin_bat
+
+  #change .bat files permissions to be read/write/executable by all users (for some reason, this is not preserved)
+  chmod 777 dsd-fme-portable/*.bat
+
+  #copy the license, copyright, source code, and things that should be included in all portable releases
+  cp dsd-fme/COPYRIGHT dsd-fme-portable/sourcecode/
+  cp dsd-fme/DSD_Author.pgp dsd-fme-portable/sourcecode/
+  cp dsd-fme/dsd-fme-qgis-map.qgz dsd-fme-portable/sourcecode/
+  cp dsd-fme/README.md dsd-fme-portable/sourcecode/
+  cp dsd-fme/dsd-fme2.png dsd-fme-portable/sourcecode/
+  cp dsd-fme/dsd-fme3.png dsd-fme-portable/sourcecode/
+
+  cp dsd-fme/CMakeLists.txt dsd-fme-portable/sourcecode/
+  cp -r dsd-fme/src dsd-fme-portable/sourcecode/
+  cp -r dsd-fme/include dsd-fme-portable/sourcecode/
+  cp -r dsd-fme/cmake dsd-fme-portable/sourcecode/
+  cp -r dsd-fme/patch dsd-fme-portable/sourcecode/
+
+  #compiled items into release dsd-fme folder
+  cp codec2/build/src/cygcodec2* dsd-fme-portable/dsd-fme/
+  cp itpp-4.3.1/build/itpp/cygitpp* dsd-fme-portable/dsd-fme/
+  cp rtl-sdr/build/src/cyg* dsd-fme-portable/dsd-fme/
+  cp mbelib/build/cygmbe* dsd-fme-portable/dsd-fme/
+
+  #bin items into release dsd-fme folder (uisng * where version numbering may exist, those may be upgraded if hard coded)
+  cp /bin/bash.exe dsd-fme-portable/dsd-fme/
+  cp /bin/cut.exe dsd-fme-portable/dsd-fme/
+  cp /bin/cygao* dsd-fme-portable/dsd-fme/
+  cp /bin/cygarchive* dsd-fme-portable/dsd-fme/
+  cp /bin/cygargp* dsd-fme-portable/dsd-fme/
+  cp /bin/cygassuan* dsd-fme-portable/dsd-fme/
+  cp /bin/cygasyncns* dsd-fme-portable/dsd-fme/
+  cp /bin/cygatomic* dsd-fme-portable/dsd-fme/
+  cp /bin/cygattr* dsd-fme-portable/dsd-fme/
+  cp /bin/cygavahi-client* dsd-fme-portable/dsd-fme/
+  cp /bin/cygavahi-common* dsd-fme-portable/dsd-fme/
+  cp /bin/cygavahi-wrap* dsd-fme-portable/dsd-fme/
+  cp /bin/cygblkid* dsd-fme-portable/dsd-fme/
+  cp /bin/cygbrotlicommon* dsd-fme-portable/dsd-fme/
+  cp /bin/cygbrotlidec* dsd-fme-portable/dsd-fme/
+  cp /bin/cygbz2* dsd-fme-portable/dsd-fme/
+  cp /bin/cygcares* dsd-fme-portable/dsd-fme/
+  cp /bin/cygcheck.exe dsd-fme-portable/dsd-fme/
+  cp /bin/cygcli.dll dsd-fme-portable/dsd-fme/
+  cp /bin/cygcom_err* dsd-fme-portable/dsd-fme/
+  cp /bin/cygcrypt* dsd-fme-portable/dsd-fme/
+  cp /bin/cygcrypto* dsd-fme-portable/dsd-fme/
+  cp /bin/cygcurl* dsd-fme-portable/dsd-fme/
+  cp /bin/cygdb_cxx* dsd-fme-portable/dsd-fme/
+  cp /bin/cygdb_sql* dsd-fme-portable/dsd-fme/
+  cp /bin/cygdb* dsd-fme-portable/dsd-fme/
+  cp /bin/cygdbus* dsd-fme-portable/dsd-fme/
+  cp /bin/cygedit* dsd-fme-portable/dsd-fme/
+  cp /bin/cygexpat* dsd-fme-portable/dsd-fme/
+  cp /bin/cygfdisk* dsd-fme-portable/dsd-fme/
+  cp /bin/cygffi* dsd-fme-portable/dsd-fme/
+  cp /bin/cygfftw3_threads* dsd-fme-portable/dsd-fme/
+  cp /bin/cygfftw3* dsd-fme-portable/dsd-fme/
+  cp /bin/cygfftw3f_threads* dsd-fme-portable/dsd-fme/
+  cp /bin/cygfftw3f* dsd-fme-portable/dsd-fme/
+  cp /bin/cygfftw3l_threads* dsd-fme-portable/dsd-fme/
+  cp /bin/cygfftw3l* dsd-fme-portable/dsd-fme/
+  cp /bin/cygfido2* dsd-fme-portable/dsd-fme/
+  cp /bin/cygFLAC* dsd-fme-portable/dsd-fme/
+  cp /bin/cygformw* dsd-fme-portable/dsd-fme/
+  cp /bin/cyggc* dsd-fme-portable/dsd-fme/
+  cp /bin/cyggdbm_compat* dsd-fme-portable/dsd-fme/
+  cp /bin/cyggdbm*.dll dsd-fme-portable/dsd-fme/
+  cp /bin/cyggio* dsd-fme-portable/dsd-fme/
+  cp /bin/cygglib* dsd-fme-portable/dsd-fme/
+  cp /bin/cyggmodule* dsd-fme-portable/dsd-fme/
+  cp /bin/cyggmp* dsd-fme-portable/dsd-fme/
+  cp /bin/cyggnutls* dsd-fme-portable/dsd-fme/
+  cp /bin/cyggobject* dsd-fme-portable/dsd-fme/
+  cp /bin/cyggomp* dsd-fme-portable/dsd-fme/
+  cp /bin/cyggpg-error* dsd-fme-portable/dsd-fme/
+  cp /bin/cyggpgme* dsd-fme-portable/dsd-fme/
+  cp /bin/cyggsm* dsd-fme-portable/dsd-fme/
+  cp /bin/cyggssapi_krb5* dsd-fme-portable/dsd-fme/
+  cp /bin/cyggthread* dsd-fme-portable/dsd-fme/
+  cp /bin/cygguile* dsd-fme-portable/dsd-fme/
+  cp /bin/cyghistory* dsd-fme-portable/dsd-fme/
+  cp /bin/cyghogweed* dsd-fme-portable/dsd-fme/
+  cp /bin/cygICE* dsd-fme-portable/dsd-fme/
+  cp /bin/cygiconv* dsd-fme-portable/dsd-fme/
+  cp /bin/cygid3tag* dsd-fme-portable/dsd-fme/
+  cp /bin/cygidn* dsd-fme-portable/dsd-fme/
+  cp /bin/cygintl* dsd-fme-portable/dsd-fme/
+  cp /bin/cygisl* dsd-fme-portable/dsd-fme/
+  cp /bin/cygjsoncpp* dsd-fme-portable/dsd-fme/
+  cp /bin/cygk5crypto* dsd-fme-portable/dsd-fme/
+  cp /bin/cygkrb5* dsd-fme-portable/dsd-fme/
+  cp /bin/cyglber* dsd-fme-portable/dsd-fme/
+  cp /bin/cygldap* dsd-fme-portable/dsd-fme/
+  cp /bin/cygltdl* dsd-fme-portable/dsd-fme/
+  cp /bin/cyglz* dsd-fme-portable/dsd-fme/
+  cp /bin/cygma* dsd-fme-portable/dsd-fme/
+  cp /bin/cygmenuw* dsd-fme-portable/dsd-fme/
+  cp /bin/cygmeta* dsd-fme-portable/dsd-fme/
+  cp /bin/cygmp* dsd-fme-portable/dsd-fme/
+  cp /bin/cygncurses* dsd-fme-portable/dsd-fme/
+  cp /bin/cygnettle* dsd-fme-portable/dsd-fme/
+  cp /bin/cygnghttp* dsd-fme-portable/dsd-fme/
+  cp /bin/cygobjc* dsd-fme-portable/dsd-fme/
+  cp /bin/cygogg* dsd-fme-portable/dsd-fme/
+  cp /bin/cygopus* dsd-fme-portable/dsd-fme/
+  cp /bin/cygorc* dsd-fme-portable/dsd-fme/
+  cp /bin/cygp11* dsd-fme-portable/dsd-fme/
+  cp /bin/cygpanel* dsd-fme-portable/dsd-fme/
+  cp /bin/cygpath.exe dsd-fme-portable/dsd-fme/
+  cp /bin/cygpcre* dsd-fme-portable/dsd-fme/
+  cp /bin/cygperl* dsd-fme-portable/dsd-fme/
+  cp /bin/cygpipe* dsd-fme-portable/dsd-fme/
+  cp /bin/cygpkg* dsd-fme-portable/dsd-fme/
+  cp /bin/cygpng* dsd-fme-portable/dsd-fme/
+  cp /bin/cygpopt* dsd-fme-portable/dsd-fme/
+  cp /bin/cygprotocol* dsd-fme-portable/dsd-fme/
+  cp /bin/cygpsl* dsd-fme-portable/dsd-fme/
+  cp /bin/cygpulse* dsd-fme-portable/dsd-fme/
+  cp /bin/cygquadmath* dsd-fme-portable/dsd-fme/
+  cp /bin/cygreadline* dsd-fme-portable/dsd-fme/
+  cp /bin/cygrhash* dsd-fme-portable/dsd-fme/
+  cp /bin/cygrunsrv.exe dsd-fme-portable/dsd-fme/
+  cp /bin/cygsamplerate* dsd-fme-portable/dsd-fme/
+  cp /bin/cygsasl* dsd-fme-portable/dsd-fme/
+  cp /bin/cygserver* dsd-fme-portable/dsd-fme/
+  cp /bin/cygSM* dsd-fme-portable/dsd-fme/
+  cp /bin/cygsmart* dsd-fme-portable/dsd-fme/
+  cp /bin/cygsndfile* dsd-fme-portable/dsd-fme/
+  cp /bin/cygsox* dsd-fme-portable/dsd-fme/
+  cp /bin/cygspeex* dsd-fme-portable/dsd-fme/
+  cp /bin/cygsqlite* dsd-fme-portable/dsd-fme/
+  cp /bin/cygssh* dsd-fme-portable/dsd-fme/
+  cp /bin/cygssl* dsd-fme-portable/dsd-fme/
+  cp /bin/cygstart.exe dsd-fme-portable/dsd-fme/
+  cp /bin/cygstdc* dsd-fme-portable/dsd-fme/
+  cp /bin/cygtasn* dsd-fme-portable/dsd-fme/
+  cp /bin/cygtdb* dsd-fme-portable/dsd-fme/
+  cp /bin/cygticw* dsd-fme-portable/dsd-fme/
+  cp /bin/cygtwo* dsd-fme-portable/dsd-fme/
+  cp /bin/cygunistring* dsd-fme-portable/dsd-fme/
+  cp /bin/cygusb* dsd-fme-portable/dsd-fme/
+  cp /bin/cyguuid* dsd-fme-portable/dsd-fme/
+  cp /bin/cyguv* dsd-fme-portable/dsd-fme/
+  cp /bin/cygvorbis* dsd-fme-portable/dsd-fme/
+  cp /bin/cygwavpack* dsd-fme-portable/dsd-fme/
+  cp /bin/cygwin1.dll dsd-fme-portable/dsd-fme/
+  cp /bin/cygwrap* dsd-fme-portable/dsd-fme/
+  cp /bin/cygX* dsd-fme-portable/dsd-fme/
+  cp /bin/cygx* dsd-fme-portable/dsd-fme/
+  cp /bin/cygz* dsd-fme-portable/dsd-fme/
+  cp /bin/grep.exe dsd-fme-portable/dsd-fme/
+  cp /bin/ls.exe dsd-fme-portable/dsd-fme/
+  cp /bin/mintty.exe dsd-fme-portable/dsd-fme/
+  cp /bin/pacat.exe dsd-fme-portable/dsd-fme/
+  cp /bin/pacmd.exe dsd-fme-portable/dsd-fme/
+  cp /bin/pactl.exe dsd-fme-portable/dsd-fme/
+  cp /bin/padsp dsd-fme-portable/dsd-fme/
+  cp /bin/pamon dsd-fme-portable/dsd-fme/
+  cp /bin/paplay dsd-fme-portable/dsd-fme/
+  cp /bin/parec dsd-fme-portable/dsd-fme/
+  cp /bin/pulseaudio.exe dsd-fme-portable/dsd-fme/
+  cp /bin/tail.exe dsd-fme-portable/dsd-fme/
+  cp /bin/touch.exe dsd-fme-portable/dsd-fme/
+  cp /bin/tty.exe dsd-fme-portable/dsd-fme/
+
+  zip -r dsd-fme-x86-64-cygwin-portable.zip dsd-fme-portable
+
+fi
--- a/cyg_rebuild.sh
+++ b/cyg_rebuild.sh
@@ -0,0 +1,14 @@
+#! /bin/bash
+#
+clear
+printf "DSD-FME Digital Speech Decoder - Florida Man Edition
+Automatic Git Pull and Rebuild for Cygwin\n\n"
+sleep 1
+##Open your clone folder##
+git pull
+sleep 2
+##cd into your build folder##
+cd build
+cmake ..
+make -j $(nproc)
+make install
--- a/download-and-install-cygwin.sh
+++ b/download-and-install-cygwin.sh
@@ -0,0 +1,93 @@
+#! /bin/bash
+#
+cdir=$(pwd)
+clear
+printf "Digital Speech Decoder: Florida Man Edition - Auto Installer For Cygwin\n
+This will install the required packages, clone, build, and install DSD-FME only.
+This has been tested on Cygwin x86-64 as of 20250211. This may take a while!\n
+MBELib is considered a requirement on this build.
+You must view the Patent Notice prior to continuing.
+The Patent Notice can be found at the site below.
+https://github.com/lwvmobile/mbelib#readme
+Please confirm that you have viewed the patent notice by entering y below.\n\n"
+read -p "Have you viewed the patent notice? y/N " ANSWER
+ANSWER=$(printf "$ANSWER"|tr '[:upper:]' '[:lower:]')
+if [ "$ANSWER" = "y" ]; then
+
+  #is this needed?
+  LD_LIBRARY_PATH=/usr/local/lib
+  export LD_LIBRARY_PATH
+  echo $LD_LIBRARY_PATH
+
+  #ITPP
+  cd $cdir
+  printf "Installing itpp 4.3.1 from source http://sourceforge.net/projects/itpp/files/latest/download?source=files\n Please wait!\n"
+  wget -O itpp-latest.tar.bz2 http://sourceforge.net/projects/itpp/files/latest/download?source=files
+  tar xjf itpp-latest.tar.bz2
+  cd itpp-4.3.1/
+  #newer Cygwin has Cmake 4.1.3 (or newer) so we need to replace the line with cmake_minimum_required to a newer version
+  #this doesn't seem to break anything, its just that cmake will refuse to run properly without a newer min version in it
+  #I'm just going to use the version that is used for most all my other cmake projects, seems to still be okay with new cmake
+  sed -i '/^cmake_minimum_required *( *VERSION *2\.8\.6 *)$/c\cmake_minimum_required(VERSION 3.10.2)' CMakeLists.txt
+  mkdir build
+  cd build
+  cmake ..
+  make -j $(nproc)
+  make install
+
+  #MBELIB
+  cd $cdir
+  printf "Installing mbelib\n Please wait!\n"
+  git clone https://github.com/lwvmobile/mbelib.git
+  cd mbelib
+  git checkout ambe_tones
+  mkdir build
+  cd build
+  cmake ..
+  make -j $(nproc)
+  make install
+  cp cygmbe-1.dll /bin
+
+  #CODEC2
+  cd $cdir
+  printf "Installing codec2\n Please wait!\n"
+  git clone https://github.com/drowe67/codec2.git
+  cd codec2
+  mkdir build
+  cd build
+  cmake ..
+  make -j $(nproc)
+  make install
+
+  #RTL-SDR
+  cd $cdir
+  printf "Installing RTL-SDR\n Please wait!\n"
+  git clone https://github.com/lwvmobile/rtl-sdr.git
+  cd rtl-sdr
+  mkdir build
+  cd build
+  cmake ..
+  make -j $(nproc)
+  make install
+
+  #DSD-FME
+  cd $cdir
+  printf "Installing DSD-FME\n Please wait!\n"
+  git clone https://github.com/lwvmobile/dsd-fme.git
+  cd dsd-fme
+  #git checkout aw_dev
+  mkdir build
+  cd build
+  cmake -DCOLORSLOGS=OFF ..
+  make -j $(nproc)
+  make install
+  cd $cdir
+
+  #call the cyg_portable script
+  sh dsd-fme/cyg_portable.sh
+
+  printf "Any issues, Please report to either:\nhttps://github.com/lwvmobile/dsd-fme/issues or\nhttps://forums.radioreference.com/threads/dsd-fme.438137/\n\n"
+
+else
+  printf "Sorry, you cannot build DSD-FME without acknowledging the Patent Notice.\n\n"
+fi
--- a/download-and-install-ubuntu2404lts.sh
+++ b/download-and-install-ubuntu2404lts.sh
@@ -12,8 +12,8 @@ read -p "Have you viewed the patent notice? y/N " ANSWER
 ANSWER=$(printf "$ANSWER"|tr '[:upper:]' '[:lower:]')
 if [ "$ANSWER" = "y" ]; then
  sudo apt update
-  sudo apt install libpulse-dev pavucontrol libsndfile1-dev libfftw3-dev liblapack-dev socat libusb-1.0-0-dev rtl-sdr librtlsdr-dev libusb-1.0-0-dev cmake git wget make build-essential libitpp-dev libncurses-dev libncurses6 libcodec2-dev
-  chkitpp=$(sudo apt list libitpp-dev 2>&1|grep -ci "installed")
+  sudo apt install libpulse-dev libsndfile1-dev libfftw3-dev liblapack-dev socat libusb-1.0-0-dev rtl-sdr librtlsdr-dev libusb-1.0-0-dev cmake git wget make build-essential libitpp-dev libncurses-dev libncurses6 libcodec2-dev
+  chkitpp=$(dpkg -l libitpp-dev 2>/dev/null | awk '/^ii/ {print 1} END {if (NR == 0) print 0}')
  if [ "$chkitpp" -lt "1" ];then 
    printf "\nFor some reason, ITPP did NOT install!\nYou may have to manually install it.\n\n"
    read -p "Press Enter to exit..." x
--- a/download-and-install.sh
+++ b/download-and-install.sh
@@ -12,8 +12,8 @@ read -p "Have you viewed the patent notice? y/N " ANSWER
 ANSWER=$(printf "$ANSWER"|tr '[:upper:]' '[:lower:]')
 if [ "$ANSWER" = "y" ]; then
  sudo apt update
-  sudo apt install libpulse-dev pavucontrol libsndfile1-dev libfftw3-dev liblapack-dev socat libusb-1.0-0-dev libncurses5 libncurses5-dev rtl-sdr librtlsdr-dev libusb-1.0-0-dev cmake git wget make build-essential libitpp-dev libncursesw5-dev libcodec2-dev
-  chkitpp=$(sudo apt list libitpp-dev 2>&1|grep -ci "installed")
+  sudo apt install libpulse-dev libsndfile1-dev libfftw3-dev liblapack-dev socat libusb-1.0-0-dev libncurses5 libncurses5-dev rtl-sdr librtlsdr-dev libusb-1.0-0-dev cmake git wget make build-essential libitpp-dev libncursesw5-dev libcodec2-dev
+  chkitpp=$(dpkg -l libitpp-dev 2>/dev/null | awk '/^ii/ {print 1} END {if (NR == 0) print 0}')
  if [ "$chkitpp" -lt "1" ];then 
    printf "\nFor some reason, ITPP did NOT install!\nYou may have to manually install it.\n\n"
    read -p "Press Enter to exit..." x
--- a/dsd-fme2.png
+++ b/dsd-fme2.png
--- a/dsd-fme3.png
+++ b/dsd-fme3.png
--- a/examples/Example_Usage.md
+++ b/examples/Example_Usage.md
@@ -171,7 +171,7 @@ Some Keyboard Shortcuts have been implemented for testing to see how users like
 esc or arrow keys - ncurses menu
 q - quit
 c - toggle compact mode
-h - toggle call history
+h - cycle event history short, long, or off
 z - toggle console payloads
 a - toggle call alert beep
 4 - force privacy/scrambler key assertion over enc identifiers (dmr and nxdn)
@@ -216,6 +216,10 @@ V - Toggle Low  Pass Filter on Analog Voice or Raw Signal Monitoring
 B - Toggle High Pass Filter on Analog Voice or Raw Signal Monitoring
 N - Toggle Passband  Filter on Analog Voice or Raw Signal Monitoring

+[ - Scroll backwards through Event History
+] - Scroll forwards  through Event History
+\ - Switch between Slot 1 and Slot 2 Event History
+
 v - Cycle RTL Input Volume Multiplier 1X, 2X, 3X (lower v)

 ```
--- a/examples/Install_Notes.md
+++ b/examples/Install_Notes.md
@@ -105,22 +105,6 @@ cd ..
 cd ..
 ```

-Note: Some environment/distro users (Cygwin, Arch, and others) may need to manually copy any libmbe files found in the build folder to the /usr/lib folder on root.
-
-```
-cp libmbe* /usr/lib
-cp cygmbe* /usr/lib
-cp cygmbe* /bin
-```
-
-or
-
-```
-sudo cp libmbe* /usr/lib
-sudo cp cygmbe* /usr/lib
-sudo cp cygmbe* /bin
-```
-
 Finish by running these steps to clone and build DSD-FME.

 ```
@@ -135,34 +119,42 @@ sudo ldconfig

 ```

+### LD_PATH
+
+Some environments may require an LD path to be set to /usr/local/lib, similar to:
+```
+LD_LIBRARY_PATH=/usr/local/lib
+export LD_LIBRARY_PATH
+```
+
 ### Windows Cygwin Builds

-If using RTL input support, you must install libusb-win32 before proceeding with Cygwin installation. You will also need to build and compile a version of librtlsdr, but this can be tricky, and personally, I had to resort to using a much older version of the source code to get it to build at all with the rtl support in the precompiled 'Aero' builds.
+Cygwin builds now have an experimental semi-automatic installer, to run, follow steps below:

-Then install all dependencies available in the repo prior to building, either directly selecting them during setup with the setup-x86.exe or setup-x64.exe or by issuing a command similar to this:
+Open Windows PowerShell (not Command Prompt) and copy and paste all of this in all at once.

 ```
-setup-x64.exe --packages libpulse-devel,libpulse-mainloop-glib0,libpulse-simple0,libpulse0,pulseaudio,pulseaudio-debuginfo,pulseaudio-equalizer,pulseaudio-module-x11,pulseaudio-module-zeroconf,pulseaudio-utils,sox-fmt-pulseaudio,xfce-pulseaudio-plugin,libusb0,libusb1.0,libusb1.0-debuginfo,libusb1.0-devel,libncurses++w10,libncurses-devel,libncursesw10,ncurses,cmake,gcc-core,gcc-debuginfo,gcc-objc,git,make,socat,sox,sox-fmt-ao,unzip,wget,gcc-g++,libsndfile-devel
-```
-
-Then manually install ITPP and MBElib, see above install notes. Be sure to run `cp libmbe* /usr/lib` after compiling MBElib.
-
-Then you can build and install using
+Invoke-WebRequest https://cygwin.com/setup-x86_64.exe -OutFile setup-x86_64.exe
+.\setup-x86_64.exe --packages nano,libpulse-devel,libpulse-mainloop-glib0,libpulse-simple0,libpulse0,pulseaudio,pulseaudio-debuginfo,pulseaudio-equalizer,pulseaudio-module-x11,pulseaudio-module-zeroconf,pulseaudio-utils,sox-fmt-pulseaudio,libusb0,libusb1.0,libusb1.0-debuginfo,libusb1.0-devel,libncurses++w10,libncurses-devel,libncursesw10,ncurses,cmake,gcc-core,gcc-debuginfo,gcc-objc,git,make,socat,sox,sox-fmt-ao,zip,unzip,wget,gcc-g++,libsndfile-devel,libopenblas,liblapack-devel,libfftw3-devel

 ```
-git clone https://github.com/lwvmobile/dsd-fme
-cd dsd-fme
-mkdir build
-cd build
-# -DAERO=ON is optional, but recommended if you want the older OSS support as well
-cmake -DAERO=ON ..
-make
-make install
+
+Pick a Mirror. http://www.gtlib.gatech.edu mirror seems relatively fast. Nurse the Cygwin installer by clicking next and waiting for it to finish. Ignore the warning popup telling you to install libusb from sourceforge. Install the [Zadig](https://zadig.akeo.ie/ "Zadig") driver instead, if you haven't already and have an RTL Dongle. After Cygwin finishes installing, the installer sh script will download and run, be patient, it may also take a little while.
+
+Then:
+
 ```
+C:\cygwin64\bin\mintty.exe /bin/bash -l -c "wget https://raw.githubusercontent.com/lwvmobile/dsd-fme/refs/heads/audio_work/download-and-install-cygwin.sh; sh download-and-install-cygwin.sh; dsd-fme;"
+
+```
+
+After the sh script finishes, dsd-fme should open. If not, then double click on the Cygwin Terminal desktop shortcut, and try running `dsd-fme`. If you chose to create a portable version, you will find the folder and zip file in the `C:\cygwin64\home\username` directory if using the default cygwin64 folder location.
+
+You can also update your versions by using the cyg_rebuild.sh script `sh cyg_rebuild.sh`.

 ### Virtual Sinks

-You may wish to direct sound into DSD-FME via Virtual Sinks. You may set up a Virtual Sink or two on your machine for routing audio in and out of applications to other applications using the following command, and opening up pavucontrol "PulseAudio Volume Control" in the menu (or `pulsemixer` in headless mode) to change line out of application to virtual sink, and line in of DSD-FME to monitor of virtual sink. This command will not persist past a reboot, so you will need to invoke them each time you reboot, or search for how to add this to your conf files for persistency if desired. Note: This setup is completely optional if using TCP Network Sink Audio and/or RTL Input.
+You may wish to direct sound into DSD-FME via Virtual Sinks. You may set up a Virtual Sink or two on your machine for routing audio in and out of applications to other applications using the following command, and opening up pavucontrol "PulseAudio Volume Control" in the menu (or `pulsemixer` in headless mode) to change line out of application to virtual sink, and line in of DSD-FME to monitor of virtual sink. This command will not persist past a reboot, so you will need to invoke them each time you reboot, or search for how to add this to your conf files for persistency if desired. Note: This setup is completely optional if using TCP Network Sink Audio and/or RTL Input. You may need to manually install either of these programs manually, if desired, or find suitable alternatives for pipewire-pulse such as pwvucontrol, or similar.

 ```
 pactl load-module module-null-sink sink_name=virtual_sink  sink_properties=device.description=Virtual_Sink
--- a/examples/cygwin_bat/9pa-close-pulse-audio-server.bat.old
+++ b/examples/cygwin_bat/9pa-close-pulse-audio-server.bat.old
@@ -0,0 +1,14 @@
+@REM Shutdown pulseaudio and clean out any remenants in /dev/shm if left behind
+
+cd dsd-fme
+pactl.exe exit
+
+@REM now navigate to the /dev/shm folder and automatically remove any 
+@REM remnants from other times pulse wasn't shut down properly
+
+cd ..
+cd dev
+cd shm
+del pulse*
+
+PAUSE
--- a/examples/cygwin_bat/9pa-start-pulse-audio-server.bat.old
+++ b/examples/cygwin_bat/9pa-start-pulse-audio-server.bat.old
@@ -0,0 +1,34 @@
+@REM Set the console / terminal to 90 columns, 50 lines
+@REM mode con: cols=90 lines=50
+
+@ECHO OFF
+
+@REM change directory into the dsd-fme folder
+cd dsd-fme
+
+@REM Start the Pulse Audio backend with a 10 minute time out
+@REM start pulse audio server with 600 second idle time and no CPU limit (prevent closing while idle in menu)
+
+@REM output from pulse server routed to NUL to supress "capabilities dropped, nag messages, etc" messages
+pulseaudio.exe --start --no-cpu-limit=TRUE --exit-idle-time=600 2> NUL
+
+@REM End pulse start up
+
+ECHO The Pulse Audio Server should now be active!
+
+@REM Setup Some null-sinks (if desired, remove @REM below)
+
+@REM pactl load-module module-null-sink sink_name=virtual_sink1  sink_properties=device.description=Virtual_Sink1
+@REM pactl load-module module-null-sink sink_name=virtual_sink2  sink_properties=device.description=Virtual_Sink2
+
+@REM Setup Default Sink to device 0 (output)
+
+pactl set-default-sink 0
+
+@REM List Avaiable Pulse Audio Sinks and Sources
+
+@ECHO ON
+
+dsd-fme -O
+
+PAUSE
--- a/examples/cygwin_bat/complete_usage_options.txt
+++ b/examples/cygwin_bat/complete_usage_options.txt
@@ -0,0 +1,224 @@
+Build Version: AW 2025-209-g14edf32 
+MBElib Version: 1.3.4
+CODEC2 Support Enabled
+
+Usage: dsd-fme [options]            Decoder/Trunking Mode
+  or:  dsd-fme [options] -r <files> Read/Play saved mbe data from file(s)
+  or:  dsd-fme -h                   Show help
+
+Display Options:
+  -N            Use NCurses Terminal
+                 dsd-fme -N 2> console_log.txt 
+  -Z            Log MBE/PDU Payloads to console
+
+Device Options:
+  -O            List All Pulse Audio Input Sources and Output Sinks (devices).
+
+Input/Output options:
+  -i <device>   Audio input device (default is pulse)
+                /dev/dsp for OSS audio (Depreciated: Will require padsp wrapper in Linux) 
+                pulse for pulse audio signal input 
+                pulse:6 or pulse:virtual_sink2.monitor for pulse audio signal input on virtual_sink2 (see -O) 
+                rtl for rtl dongle (Default Values -- see below)
+                rtl:dev:freq:gain:ppm:bw:sq:vol for rtl dongle (see below)
+                tcp for tcp client SDR++/GNURadio Companion/Other (Port 7355)
+                tcp:192.168.7.5:7355 for custom address and port 
+                filename.bin for OP25/FME capture bin files
+                filename.wav for 48K/1 wav files (SDR++, GQRX)
+                filename.wav -s 96000 for 96K/1 wav files (DSDPlus)
+                (Use single quotes '/directory/audio file.wav' when directories/spaces are present)
+  -s <rate>     Sample Rate of wav input files (48000 or 96000) Mono only!
+  -o <device>   Audio output device (default is pulse)
+                /dev/dsp for OSS audio (Depreciated: Will require padsp wrapper in Linux) 
+                pulse for pulse audio decoded voice or analog output
+                pulse:1 or pulse:alsa_output.pci-0000_0d_00.3.analog-stereo for pulse audio decoded voice or analog output on device (see -O) 
+                null for no audio output
+                udp for UDP socket blaster output (default host 127.0.0.1; default port 23456)
+                udp:192.168.7.8:23470 for UDP socket blaster output (Target Address and Port
+  -d <dir>      Create mbe data files, use this directory (TDMA version is experimental)
+  -r <files>    Read/Play saved mbe data from file(s)
+  -g <float>    Audio Digital Output Gain  (Default: 0 = Auto;        )
+                                           (Manual:  1 = 2%; 50 = 100%)
+  -n <float>    Audio Analog  Output Gain  (Default: 0 = Auto; 0-100%  )
+  -6 <file>     Output raw audio .wav file (48K/1). (WARNING! Large File Sizes 1 Hour ~= 360 MB)
+  -7 <dir>      Create/Use Custom directory for Per Call decoded .wav file saving.
+                 (Use ./folder for Nested Directory!)
+                 (Use /path/to/folder for hard coded directory!)
+                 (Use Before the -P option!)
+  -8            Enable Source Audio Monitor
+                 (Set Squelch in RTL, SDR++ or GQRX, etc, if monitoring mixed analog/digital)
+  -w <file>     Output synthesized speech to a single static .wav file. (Do not use with -P Per Call Switch)
+  -P            Enable Per Call WAV file saving. (Do not use with -w filename.wav single wav file switch)
+                 (Per Call works with everything now and doesn't require ncurses terminal!)
+  -a            Enable Call Alert Beep
+                 (Warning! Might be annoying.)
+  -J <file>     Specify Filename for Event Log Output.
+  -L <file>     Specify Filename for LRRP Data Output.
+  -Q <file>     Specify Filename for OK-DMRlib Structured File Output. (placed in DSP folder)
+  -Q <file>     Specify Filename for M17 Float Stream Output. (placed in DSP folder)
+  -c <file>     Output symbol capture to .bin file
+  -q            Reverse Mute - Mute Unencrypted Voice and Unmute Encrypted Voice
+  -V <num>      Enable TDMA Voice Synthesis on Slot 1 (1), Slot 2 (2), or Both (3); Default is 3; 
+  -z            Set TDMA Voice Slot Preference when using /dev/dsp audio output (prevent lag and stuttering)
+  -y            Enable Experimental Pulse Audio Float Audio Output
+  -v <hex>      Set Filtering Bitmap Options (Advanced Option)
+                1 1 1 1 (0xF): PBF/LPF/HPF/HPFD on
+
+RTL-SDR options:
+ Usage: rtl:dev:freq:gain:ppm:bw:sq:vol
+  NOTE: all arguments after rtl are optional now for trunking, but user configuration is recommended
+  dev  <num>    RTL-SDR Device Index Number or 8 Digit Serial Number, no strings! (default 0)
+  freq <num>    RTL-SDR Frequency (851800000 or 851.8M) 
+  gain <num>    RTL-SDR Device Gain (0-49)(default = 0; Hardware AGC recommended)
+  ppm  <num>    RTL-SDR PPM Error (default = 0)
+  bw   <num>    RTL-SDR Bandwidth kHz (default = 12)(4, 6, 8, 12, 16, 24)  
+  sq   <num>    RTL-SDR Squelch Level vs RMS Value (Optional)
+  vol  <num>    RTL-SDR Sample 'Volume' Multiplier (default = 2)(1,2,3)
+ Example: dsd-fme -fs -i rtl -C cap_plus_channel.csv -T
+ Example: dsd-fme -fp -i rtl:0:851.375M:22:-2:24:0:2
+
+Decoder options:
+  -fa           Auto Detection
+  -fA           Passive Analog Audio Monitor
+  -ft           TDMA Trunking P25p1 Control and Voice, P25p2 Trunked Channels, and DMR
+  -fs           DMR TDMA BS and MS Simplex
+  -f1           Decode only P25 Phase 1
+  -f2           Decode only P25 Phase 2 (6000 sps) **
+  -fd           Decode only DSTAR
+  -fx           Decode only X2-TDMA
+  -fy           Decode only YSF
+  -fz             Decode only M17*
+  -fi             Decode only NXDN48* (6.25 kHz) / IDAS*
+  -fn             Decode only NXDN96* (12.5 kHz)
+  -fp             Decode only ProVoice*
+  -fh             Decode only EDACS Standard/ProVoice*
+  -fH             Decode only EDACS Standard/ProVoice with ESK 0xA0*
+  -fh344          Decode only EDACS Standard/ProVoice and set AFS to 344 or similar custom 11-bit scheme*
+  -fH434          Decode only EDACS Standard/ProVoice and set AFS to custom 11-bit scheme with ESK 0xA0*
+  -fe             Decode only EDACS EA/ProVoice*
+  -fE             Decode only EDACS EA/ProVoice with ESK 0xA0*
+  -fm             Decode only dPMR*
+  -l            Disable DMR, dPMR, NXDN, M17 input filtering
+  -u <num>      Unvoiced speech quality (default=3)
+  -xx           Expect non-inverted X2-TDMA signal
+  -xr           Expect inverted DMR signal
+  -xd           Expect inverted ICOM dPMR signal
+
+  * denotes frame types that cannot be auto-detected.
+  ** Phase 2 Single Frequency may require user to manually set WACN/SYSID/CC parameters if MAC_SIGNAL not present.
+
+Advanced Decoder options:
+  -X <hex>      Manually Set P2 Parameters (WACN, SYSID, CC/NAC)
+                 (-X BEE00ABC123)
+  -_ <dec>      Manually Set NXDN PN95 Dibit Scrambler Seed (1-511)
+                 (-* 261)
+  -D <dec>      Manually Set TIII DMR Location Area n bit len (0-10)(10 max)
+                 (Value defaults to max n bit value for site model size)
+                 (Setting 0 will show full Site ID, no area/subarea)
+
+  -ma           Auto-select modulation optimizations
+  -mc           Use only C4FM modulation optimizations (default)
+  -mg           Use only GFSK modulation optimizations
+  -mq           Use only QPSK modulation optimizations
+  -m2           Use P25p2 6000 sps QPSK modulation optimizations
+  -F            Relax P25 Phase 2 MAC_SIGNAL CRC Checksum Pass/Fail
+                 Use this feature to allow MAC_SIGNAL even if CRC errors.
+  -F            Relax DMR RAS/CRC CSBK/DATA Pass/Fail
+                 Enabling on some systems could lead to bad channel assignments/site data decoding if bad or marginal signal
+
+  -b <dec>      Manually Enter Basic Privacy Key (Decimal Value of Key Number)
+                 (NOTE: This used to be the 'K' option!) 
+
+  -H <hex>      Manually Enter Hytera 10/32/64 Char Basic Privacy Hex Key (see example below)
+                 Encapulate in Single Quotation Marks; Space every 16 chars.
+                 -H 0B57935150 
+                 -H '736B9A9C5645288B 243AD5CB8701EF8A' 
+                 -H '20029736A5D91042 C923EB0697484433 005EFC58A1905195 E28E9C7836AA2DB8' 
+
+  -H <hex>      Manually Enter AES-128, AES-256, or Kirisun-256 Hex Key (see example below)
+                 Encapulate in Single Quotation Marks; Space every 16 chars.
+                 -H '736B9A9C5645288B 243AD5CB8701EF8A' 
+                 -H '20029736A5D91042 C923EB0697484433 005EFC58A1905195 E28E9C7836AA2DB8' 
+
+  -R <dec>      Manually Enter dPMR or NXDN EHR Scrambler Key Value (Decimal Value)
+                 
+  -1 <hex>      Manually Enter RC4 or DES Key Value (DMR, P25, NXDN) (Hex Value) 
+                 
+  -2 <hex>      Manually Enter and Enforce TYT 16-bit BP Key Value (DMR) (Hex Value) 
+                 
+  -! <hex>      Manually Enter and Enforce TYT Advanced Privacy (PC4) 128 or 256 bit AP Hex Key (see example below)
+                 Encapulate in Single Quotation Marks; Space every 16 chars.
+                 -! '736B9A9C5645288B 243AD5CB8701EF8A' 
+                 -! '1111111111111111 1111111111111111 1111111111111111 1111111111111111' 
+                 
+  -@ <hex>      Manually Enter and Enforce Retevis Advanced Privacy (RC2) 128 or 256 bit AP Hex Key (see example below)
+                 Encapulate in Single Quotation Marks; Space every 16 chars.
+                 -@ '736B9A9C5645288B 243AD5CB8701EF8A' 
+                 -@ '1122334455667788 99AABBCCDDEEFF11 1122334455667788 99AABBCCDDEEFF11' 
+                 
+  -5 <hex>      Manually Enter and Enforce TYT Enhanced Privacy (AES-128) EP Hex Key (see example below)
+                 Encapulate in Single Quotation Marks; Space every 16 chars.
+                 -5 '736B9A9C5645288B 243AD5CB8701EF8A' 
+                 
+  -+ <hex>      Manually Enter and Enforce Baofeng Advanced Privacy (PC5-128 or PC5-256) AP Hex Key (see example below)
+                 Encapulate in Single Quotation Marks; Space every 16 chars.
+                 -+ 'ABCDABCDABCDABCD ABDCDABCDABCDABC' 
+                 -+ 'ABCDABCDABCDABCD ABDCDABCDABCDABC EF01EF01EF01EF01 EF01EF01EF01EF01' 
+                 
+  -^ <hex>      Manually Enter and Enforce Connect Systems 72-bit (9-byte) Extended Encryption Hex Key (see example below)
+                 -^  3BBE782C0430008271
+                 
+  -9 <dec>      Manually Enter and Enforce Kenwood 15-bit Scrambler Key Value (DMR) (Dec Value) 
+                 
+  -A <hex>      Manually Enter and Enforce Anytone 16-bit BP Key Value (DMR) (Hex Value) 
+                 
+  -S <str>      Manually Enter and Enforce Generic Static Keystream -> Length and BYTE PACKED / ALIGNED String for AMBE (up to 882 bits)
+                  For Example, enter 16-bit Keystream 0909 as:
+                    -S 16:0909
+                  For Example, enter 49-bit Keystream as:
+                    -S 49:123456789ABC80
+                  For Example, enter 49-bit Keystream (MBP 70) as:
+                    -S 49:ED0AED4AED4AED4A
+                  For Example, Baofeng 49-bit Keystream for 56-bit Custom Encryption as:
+                    -S 49:11AA22BB33CC44
+                 
+  -k <file>     Import Key List from csv file (Decimal Format) -- Lower Case 'k'.
+                  Only supports NXDN, DMR Basic Privacy (decimal value). 
+                  (dPMR and Hytera 32/64 char not supported, DMR uses TG value as key id -- EXPERIMENTAL!!). 
+                 
+  -K <file>     Import Key List from csv file (Hexidecimal Format) -- Capital 'K'.
+                  Use for Hex Value Hytera 10-char BP keys, RC4 10-char, DES 16-char Hex Keys, and AES128/256 32/64-char keys. 
+                 
+  -4            Force Privacy Key over Encryption Identifiers (DMR MBP/HBP and NXDN Scrambler) 
+                 
+  -0            Force RC4 Key over Missing PI header/LE Encryption Identifiers (DMR) 
+                 
+  -M <hex>      Force Entered Alg ID Value over Missing PI header/LE Encryption Identifiers (DMR) 
+                 
+  -3            Disable DMR Late Entry Encryption Identifiers (VC6 Single Burst) 
+                  Note: Disable this if false positives on Voice ENC occur. 
+
+ Trunking Options:
+  -C <file>     Import Channel to Frequency Map (channum, freq) from csv file. (Capital C)                   
+                 (See channel_map.csv for example)
+  -G <file>     Import Group List Allow/Block and Label from csv file.
+                 (See group.csv for example)
+  -T            Enable Trunking Features (NXDN/P25/EDACS/DMR) with RIGCTL/TCP or RTL Input
+  -Y            Enable Scanning Mode with RIGCTL/TCP or RTL Input 
+                 Experimental -- Can only scan for sync with enabled decoders, don't mix NXDN and DMR/P25!
+                 This is not a Trunking Feature, just scans through conventional frequencies fast!
+  -W            Use Imported Group List as a Trunking Allow/White List -- Only Tune with Mode A
+  -p            Disable Tune to Private Calls (DMR TIII, P25, NXDN Type-C and Type-D)
+  -E            Disable Tune to Group Calls (DMR TIII, Con+, Cap+, P25, NXDN Type-C, and Type-D)
+  -e            Enable Tune to Data Calls (DMR TIII, Cap+, NXDN Type-C)
+                 (NOTE: No Clear Distinction between Cap+ Private Voice Calls and Data Calls -- Both enabled with Data Calls 
+  -I <dec>      Specify TG to Hold During Trunking (DMR, P25, NXDN Type-C Trunking)
+  -U <port>     Enable RIGCTL/TCP; Set TCP Port for RIGCTL. (4532 on SDR++)
+  -B <Hertz>    Set RIGCTL Setmod Bandwidth in Hertz (0 - default - OFF)
+                 P25 - 12000; NXDN48 - 7000; NXDN96: 12000; DMR - 7000-12000; EDACS/PV - 12000-24000;
+                 May vary based on system stregnth, etc.
+  -t <secs>     Set Trunking or Scan Speed VC/sync loss hangtime in seconds. (default = 1 second)
+
+ Trunking Example TCP: dsd-fme -fs -i tcp -U 4532 -T -C dmr_t3_chan.csv -G group.csv -N 2> log.txt
+ Trunking Example RTL: dsd-fme -fs -i rtl:0:450M:26:-2:8 -T -C connect_plus_chan.csv -G group.csv -N 2> log.txt
+
--- a/examples/cygwin_bat/example_options.txt
+++ b/examples/cygwin_bat/example_options.txt
@@ -0,0 +1,97 @@
+This example options contains numerous options put into the start-dsd-fme.bat file in the option string
+feel free to experiment and mix and match example options for your bat files option string.
+
+Trunking Option Examples:
+
+  P25 (Phase 1 Control) Trunking with SDR++ Network Sink input, RIGCTL, /dev/dsp output,
+  per call wav files, ncurses terminal
+  -ft -i tcp:127.0.0.1:7355 -U 4532 -T -P -N
+
+  P25 (Phase 2 Control) Trunking with SDR++ Network Sink input, RIGCTL, /dev/dsp output,
+  per call wav files, ncurses terminal
+  -f2 -i tcp:127.0.0.1:7355 -U 4532 -T -P -N
+
+  DMR Trunking with RTL input, /dev/dsp output, channel map import,
+  per call wav files, ncurses terminal, payload dump to console
+  -fs -i rtl:0:450M:0:-2:12 -T -C examples\dmr_t3_chan.csv -P -N -Z
+
+  DMR Trunking with SDR++ input, RIGCTL, /dev/dsp output, RAS enabled CSBK (-F),
+  channel map import, per call wav files, ncurses terminal, payload dump to console
+  -fs -F -i tcp -U 4532 -T -C examples\capacity_plus_chan.csv -P -N -Z
+
+  NXDN48 v2.0 DFA (Direct Frequency Assignment) Trunking with SDR++ input, RIGCTL, /dev/dsp output,
+  scrambler key import (decimal), per call wav files, ncurses terminal, payload dump to console
+  -fi -i tcp -U 4532 -T -P -N -Z -k examples\nxdn_sc_key.csv
+
+  NXDN96 Trunking with SDR++ input, RIGCTL, /dev/dsp output,
+  channel map import, per call wav files, ncurses terminal, payload dump to console
+  -fn -i tcp -U 4532 -T -C examples\nxdn_chan_map.csv -P -N -Z
+
+  EDACS Standard Network Analog and Digital
+  -fh -i tcp -U 4532 -T -C edacs_channel_map.csv -G group.csv -N
+  -fh -i rtl:0:850M:44:-2:24 -T -C edacs_channel_map.csv -G group.csv -N
+
+  EDACS Extended Address Analog and Digital (with ESK)
+  -fE -i tcp:192.168.7.5:7355 -U 4532 -T -C edacs_channel_map.csv -G group.csv -N
+  -fE -i rtl:0:850M:44:-2:24 -T -C edacs_channel_map.csv -G group.csv -N
+
+Scanning Option Examples:
+
+  Scanning will not perform quickly like a real scanner, but can be used with any
+  supported decoding type and analog as well, and will require a channel_map to scan frequencies
+  channel numbers do not matter, but use unique ones for each frequeny
+  -t 0 will scan as fast as possible, but may miss frame sync, -t 1 is stable, but needs 1 second between tuning
+
+  P25/DMR/Analog Scanning with RTL input, /dev/dsp output, channel map import,
+  per call wav files, ncurses terminal, payload dump to console, raw audio signal monitoring
+  -ft -i rtl:0:450M:0:-2:12 -Y -t 1 -C examples\dmr_t3_chan.csv -P -8 -N -Z
+
+  P25/DMR/Analog Scanning with SDR++ input (use squelch), RIGCTL, /dev/dsp output, channel map import,
+  per call wav files, ncurses terminal, payload dump to console, raw audio signal monitoring
+  -ft -i tcp:127.0.0.1:7355 -U 4532 -Y -t 1 -C examples\dmr_t3_chan.csv -P -8 -N -Z
+
+  NXDN48/Analog Scanning with SDR++ input (use squelch), RIGCTL, /dev/dsp output, channel map import,
+  per call wav files, ncurses terminal, payload dump to console, raw audio signal monitoring
+  -fi -i tcp:127.0.0.1:7355 -U 4532 -Y -t 1-C examples\nxdn_chan_map.csv -P -8 -N -Z
+
+  Analog Scanning with SDR++ input (use squelch), RIGCTL, /dev/dsp output, channel map import
+  -fA -i tcp:127.0.0.1:7355 -U 4532 -Y -t 0 -C examples\nxdn_chan_map.csv -8
+
+Encryption Option Examples:
+
+  DMR with default /dev/dsp input and output, use basic privacy key 70
+  -fs -b 70
+
+  DMR with default /dev/dsp input and output, load .csv file with decimal basic privacy keys loaded by TG value,
+  -fs -k examples\multi_key.csv
+
+  DMR with default /dev/dsp input and output, use Hytera basic privacy key (10, 32, and 64 hex char versions)
+  -fs -H 1111111111
+  -fs -H '2222222222222222 3333333333333333'
+  -fs -H '2222222222222222 3333333333333333 4444444444444444 5555555555555555'
+
+  DMR with default /dev/dsp input and output, use RC4 key 0x7777777777
+  -fs -1 7777777777
+
+  DMR with default /dev/dsp input and output, use RC4 key 0x7777777777, 
+  Force RC4 Key over Missing PI header/LE Encryption Identifiers (-0)
+  Disable Late Entry Encryption Signalling Identifiers (-3)
+  -fs -0 -3 -1 7777777777
+
+  DMR with default /dev/dsp input and output, load RC4 and 10-char HBP keys from .csv file (hexidecimal format)
+  -fs -K dsd-fme\examples\multi_key_hex.csv
+
+  P25 with default /dev/dsp input and output, use RC4 key 0x7777777777
+  -ft -1 7777777777
+
+  NXDN48 with default /dev/dsp input and output, use Scrambler key 32767
+  -fi -R 32767
+
+  NXDN96 with default /dev/dsp input and output, use Scrambler key 15000
+  -fn -R 15000
+
+  dPMR with default /dev/dsp input and output, use Scrambler key 32767
+  -fm -R 32767
+
+  NXDN48 with default /dev/dsp input and output, load scrambler keys from .csv file (decimal format)
+  -fi -k dsd-fme\examples\nxdn_sc_key.csv
--- a/examples/cygwin_bat/readme_cygwin_bat.txt
+++ b/examples/cygwin_bat/readme_cygwin_bat.txt
@@ -0,0 +1 @@
+These .bat files are ONLY for use on the portable cygwin builds, do not use these in any other build environments!
--- a/examples/cygwin_bat/start-dsd-fme.bat
+++ b/examples/cygwin_bat/start-dsd-fme.bat
@@ -0,0 +1,74 @@
+@REM Digital Speech Decoder: Florida Man Edition
+@REM DSD-FME Cygwin Windows Portable Builds
+@REM
+@REM The source code of this software can be downloaded here:
+@REM https://github.com/lwvmobile/dsd-fme
+@REM
+@REM If you paid for, or were otherwise fleeced for this software, DEMAND YOUR MONEY BACK!
+@REM
+@REM This software is designed to be used with an SDR receiver (like SDR++ or SDR#) with TCP input,
+@REM RTL Input, media file playback over virtual cables or null-sinks, or a Discriminator Tap input
+@REM
+@REM The complete options list can be seen by viewing complete_usage_options.txt
+@REM Many examples can be found in example_options.txt
+@REM
+@REM Enjoy!
+
+@REM Regarding the options string (or any string in .bat files)
+@REM If your string may contain spaces, set the first '"' before options, and then an ending '"' 
+@REM Incorrect: set options="-fs -N -Z"
+@REM Correct: set "options=-fs -N -Z"
+
+@REM set options to pass to dsd-fme
+set "options= -N -Z "
+
+@REM Set Date Time for log (sourced from: https://stackoverflow.com/questions/1192476/format-date-and-time-in-a-windows-batch-script)
+@echo off
+REM "%date: =0%" replaces spaces with zeros
+set d=%date: =0%
+REM "set yyyy=%d:~-4%" pulls the last 4 characters
+set yyyy=%d:~-4%
+set mm=%d:~4,2%
+set dd=%d:~7,2%
+set dow=%d:~0,3%
+set d=%yyyy%%mm%%dd%
+
+set t=%TIME: =0%
+REM "%t::=%" removes semi-colons
+REM Instead of above, you could use "%t::=-%" to 
+REM replace semi-colons with hyphens (or any 
+REM non-special character)
+set t=%t::=%
+set t=%t:.=%
+
+set datetimestr=%d%_%t%
+@REM @echo Long date time str = %datetimestr%
+
+@REM random number is used so that two log files don't share the same name
+set rnd=%RANDOM%
+
+@REM set log file relative filepath
+set "clog=.\logs\console_log_%datetimestr%_%rnd%.txt"
+set "elog=.\logs\event_log_%datetimestr%_%rnd%.txt"
+
+@REM create the log file now with touch
+.\dsd-fme\touch.exe %clog%
+.\dsd-fme\touch.exe %elog%
+
+@REM Launch Tail to display the console log and event log in a seperate console windows
+start .\dsd-fme\tail.exe -n 40 -f %clog%
+start .\dsd-fme\tail.exe -n 40 -f %elog%
+
+@REM start dsd-fme with options and logs 
+.\dsd-fme\dsd-fme.exe %options% -J %elog% 2> %clog%
+
+echo ----------------------------------------------------------------------------------
+echo ----------------------------------------------------------------------------------
+echo For any errors, see: %clog% 
+echo Forward %clog% and Options: "%options%" 
+echo to developer on Github or Radio Reference for troubleshooting.
+echo ----------------------------------------------------------------------------------
+echo ----------------------------------------------------------------------------------
+
+@REM Set pause to diplay above message
+PAUSE
--- a/examples/example_aes_keys.csv
+++ b/examples/example_aes_keys.csv
@@ -0,0 +1,7 @@
+keyid(hex), keyvalue(hex)
+0001,0000000000000000,0000000000000000,0000000000000000,0000002823d87923
+0003,0101010101010101,0101010101010101
+0004,0101010101010101,0101010101010101,0101010101010101,0101010101010101
+C197,A753BC945DE5E0F1,EC1970F8565154E6,D9DF2FAC6278FA93,B531D2CC046E93A2
+0067,0000000000000000,0000000000000000,0000000000000000,DEADBEEFBAADF00D
+0000,0000000000000000,0000000000000000,0000000000000000,0000000000000001
--- a/examples/group.csv
+++ b/examples/group.csv
@@ -1,4 +1,4 @@
-DEC,Mode(A- Allow, B - Block, DE - Digital Enc),Name of Group,Tag (do not delete this line or won't import properly)
+DEC,Mode(A- Allow; B - Block; DE - Digital Enc),Name of Group,Tag (do not delete this line or won't import properly)
 100,B,Example Name,Tag
 1449,A,Fire Dispatch,Fire
 929,A,Fire Tac,Fire
--- a/examples/start-dsd-fme-linux-terminal.sh
+++ b/examples/start-dsd-fme-linux-terminal.sh
@@ -0,0 +1,112 @@
+#!/bin/bash
+# Force bash for better compatibility (I think)
+#
+# Digital Speech Decoder: Florida Man Edition
+#
+# The source code of this software can be downloaded here:
+# https://github.com/lwvmobile/dsd-fme
+#
+# If you paid for, or were otherwise fleeced for this software, DEMAND YOUR MONEY BACK!
+#
+# This software is designed to be used with an SDR receiver (like SDR++ or SDR#) with TCP input,
+# RTL Input, media file playback over virtual cables or null-sinks, or a Discriminator Tap input
+#
+# The complete options list can be seen by viewing complete_usage_options.ans
+# Many examples can be found in example_options.ans
+#
+# Enjoy!
+###
+#### IMPORTANT!  Set your dsd-fme options here! ####
+# Example : opts=' -ft -i rtl:0:460.350M:0:-1:8 -N -Z '
+####
+# set options to pass to dsd-fme
+opts=' -N -Z '
+####
+# Initialize variables
+xe="0"
+gt="0"
+xt="0"
+ko="0"
+# Functions to check for available terminals
+chk_xe(){
+# Check if x-terminal-emulator is installed
+xe=$(which x-terminal-emulator 2>/dev/null)
+if [ -z $xe ];then xe="0";else xe="1";fi
+}
+chk_gt(){
+# Check if gnome-terminal is installed
+gt=$(which gnome-terminal 2>/dev/null)
+if [ -z $gt ];then gt="0";else gt="1";fi
+}
+chk_ko(){
+# Check if Konsole is installed
+ko=$(which konsole 2>/dev/null)
+if [ -z $ko ];then ko="0";else ko="1";fi
+}
+chk_xt(){
+# Check if xterm is installed
+xt=$(which xterm 2>/dev/null)
+if [ -z $xt ];then xt="0";else xt="1";fi
+}
+# Check for and set terminal
+chk_xe
+if [ $xe = "1" ];then
+  term=$(which x-terminal-emulator 2>/dev/null)
+  printf "Using X-Terminal-Emulator!\n"
+else
+  chk_gt
+fi
+if [ $gt = "1" ];then
+  term=$(which gnome-terminal 2>/dev/null)
+  printf "Using Gnome-Terminal!\n"
+elif [ $xe = "0" ]&&[ $gt = "0" ];then
+  chk_xt
+fi
+if [ $xt = "1" ];then
+  term=$(which xterm 2>/dev/null)
+  printf "Using XTerm!\n"
+elif [ $xe = "0" ]&&[ $gt = "0" ]&&[ $xt = "0" ];then
+  chk_ko
+fi
+if [ $ko = "1" ];then
+  term=$(which konsole 2>/dev/null)
+  printf "Using Konsole!\n"
+fi
+# Bail if no terminal found
+if [ "$ko" -eq "0" ]&&[ "$gt" -eq "0" ]&&[ "$xt" -eq "0" ]&&[ "$xe" -eq "0" ];then printf "No known terminals available!\n";exit 1;fi
+# Get current directory
+wd=$(pwd)
+# Set date/time
+# dt=$(date +%F_%H%M-%S-%N) #with hyphens
+dt=$(date +%Y%m%d_%H%M%S) #just an underscore between date and time
+if [ ! -d "logs" ]; then
+  mkdir logs
+fi
+# set log file relative filepath
+clog="$wd/logs/console_log_$dt.txt"
+elog="$wd/logs/event_log_$dt.txt"
+# create the log file now with touch
+touch $clog
+touch $elog
+# open new terminal windows to watch live log files
+if [ "$term" == "$(which konsole)" ]||[ "$term" == "$(which xterm)" ];then
+  $term -e "tail -n 40 -f $clog" 2>/dev/null
+  $term -e "tail -n 40 -f $elog" 2>/dev/null
+else
+  $term --window -e "tail -n 40 -f $clog" 2>/dev/null
+  $term --window -e "tail -n 40 -f $elog" 2>/dev/null
+fi
+# start dsd-fme with options and log files
+dsd-fme $opts -J $elog 2> $clog
+echo -------------------------------------------------------------------------------
+echo -------------------------------------------------------------------------------
+echo For any errors, see: $clog 
+echo Forward $clog and 
+echo Options: \" $opts \"
+echo to developer on Github or Radio Reference for troubleshooting.
+echo -------------------------------------------------------------------------------
+echo -------------------------------------------------------------------------------
+
+# Set pause to diplay above message
+read -p "Press ENTER to continue... " x
+
--- a/include/bp.h
+++ b/include/bp.h
@@ -0,0 +1,71 @@
+#ifndef BP_H
+#define BP_H
+
+static const uint16_t BPK[256] = {
+//000
+0x0000, 0x1F00, 0xE300, 0xFC00, 0x2503, 0x3A03, 0xC603, 0xD903,
+//008
+0x4A05, 0x5505, 0xA905, 0xB605, 0x6F06, 0x7006, 0x8C06, 0x9306,
+//016
+0x2618, 0x3918, 0xC518, 0xDA18, 0x031B, 0x1C1B, 0xE01B, 0xFF1B,
+//024
+0x6C1D, 0x731D, 0x8F1D, 0x901D, 0x491E, 0x561E, 0xAA1E, 0xB51E,
+//032
+0x4B28, 0x5428, 0xA828, 0xB728, 0x6E2B, 0x712B, 0x8D2B, 0x922B,
+//040
+0x012D, 0x1E2D, 0xE22D, 0xFD2D, 0x242E, 0x3B2E, 0xC72E, 0xD82E,
+//048
+0x6D30, 0x7230, 0x8E30, 0x9130, 0x4833, 0x5733, 0xAB33, 0xB433,
+//056
+0x2735, 0x3835, 0xC435, 0xDB35, 0x0236, 0x1D36, 0xE136, 0xFE36,
+//064
+0x2B49, 0x3449, 0xC849, 0xD749, 0x0E4A, 0x114A, 0xED4A, 0xF24A,
+//072
+0x614C, 0x7E4C, 0x824C, 0x9D4C, 0x444F, 0x5B4F, 0xA74F, 0xB84F,
+//080
+0x0D51, 0x1251, 0xEE51, 0xF151, 0x2852, 0x3752, 0xCB52, 0xD452,
+//088
+0x4754, 0x5854, 0xA454, 0xBB54, 0x6257, 0x7D57, 0x8157, 0x9E57,
+//096
+0x6061, 0x7F61, 0x8361, 0x9C61, 0x4562, 0x5A62, 0xA662, 0xB962,
+//104
+0x2A64, 0x3564, 0xC964, 0xD664, 0x0F67, 0x1067, 0xEC67, 0xF367,
+//112
+0x4679, 0x5979, 0xA579, 0xBA79, 0x637A, 0x7C7A, 0x807A, 0x9F7A,
+//120
+0x0C7C, 0x137C, 0xEF7C, 0xF07C, 0x297F, 0x367F, 0xCA7F, 0xD57F,
+//128
+0x4D89, 0x5289, 0xAE89, 0xB189, 0x688A, 0x778A, 0x8B8A, 0x948A,
+//136
+0x078C, 0x188C, 0xE48C, 0xFB8C, 0x228F, 0x3D8F, 0xC18F, 0xDE8F,
+//144
+0x6B91, 0x7491, 0x8891, 0x9791, 0x4E92, 0x5192, 0xAD92, 0xB292,
+//152
+0x2194, 0x3E94, 0xC294, 0xDD94, 0x0497, 0x1B97, 0xE797, 0xF897,
+//160
+0x06A1, 0x19A1, 0xE5A1, 0xFAA1, 0x23A2, 0x3CA2, 0xC0A2, 0xDFA2,
+//168
+0x4CA4, 0x53A4, 0xAFA4, 0xB0A4, 0x69A7, 0x76A7, 0x8AA7, 0x95A7,
+//176
+0x20B9, 0x3FB9, 0xC3B9, 0xDCB9, 0x05BA, 0x1ABA, 0xE6BA, 0xF9BA,
+//184
+0x6ABC, 0x75BC, 0x89BC, 0x96BC, 0x4FBF, 0x50BF, 0xACBF, 0xB3BF,
+//192
+0x66C0, 0x79C0, 0x85C0, 0x9AC0, 0x43C3, 0x5CC3, 0xA0C3, 0xBFC3,
+//200
+0x2CC5, 0x33C5, 0xCFC5, 0xD0C5, 0x09C6, 0x16C6, 0xEAC6, 0xF5C6,
+//208
+0x84D0, 0x85DF, 0x8AD3, 0x8BDC, 0xB6D5, 0xB7DA, 0xB8D6, 0xB9D9,
+//216
+0xD0DA, 0xD1D5, 0xDED9, 0xDFD6, 0xE2DF, 0xE3D0, 0xECDC, 0xEDD3,
+//224
+0x2DE8, 0x32E8, 0xCEE8, 0xD1E8, 0x08EB, 0x17EB, 0xEBEB, 0xF4EB,
+//232
+0x67ED, 0x78ED, 0x84ED, 0x9BED, 0x42EE, 0x5DEE, 0xA1EE, 0xBEEE,
+//240
+0x0BF0, 0x14F0, 0xE8F0, 0xF7F0, 0x2EF3, 0x31F3, 0xCDF3, 0xD2F3,
+//248
+0x41F5, 0x5EF5, 0xA2F5, 0xBDF5, 0x64F6, 0x7BF6, 0x87F6, 0x98F6
+};
+
+#endif
--- a/include/descramble.h
+++ b/include/descramble.h
@@ -17,7 +17,7 @@
 *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *	GNU General Public License for more details.
 */
- 
+
 // This code was originally written by JOnathan Naylor, G4KLX, as part
 // of the "pcrepeatercontroller" project
 // More info:
@@ -55,7 +55,7 @@ int traceBack (int * out, int * m_pathMemory0, int * m_pathMemory1, int * m_path
 				} // end else - if
 				out[loop]=0;
 				break;
-			
+
 			case S1: // if state S1
 				if (m_pathMemory1[loop]) {
 					state = S2; // lower path
@@ -64,7 +64,7 @@ int traceBack (int * out, int * m_pathMemory0, int * m_pathMemory1, int * m_path
 				} // end else - if
 				out[loop]=1;
 				break;
-			
+
 			case S2: // if state S2
 				if (m_pathMemory2[loop]) {
 					state = S3; // lower path
@@ -73,7 +73,7 @@ int traceBack (int * out, int * m_pathMemory0, int * m_pathMemory1, int * m_path
 				} // end else - if
 				out[loop]=0;
 				break;
-			
+
 			case S3: // if state S3
 				if (m_pathMemory3[loop]) {
 					state = S3; // lower path
@@ -82,7 +82,7 @@ int traceBack (int * out, int * m_pathMemory0, int * m_pathMemory1, int * m_path
 				} // end else - if
 				out[loop]=1;
 				break;
-			
+
 		} // end switch
 	} // end for

@@ -161,7 +161,7 @@ void viterbiDecode (int n, int *data, int *m_pathMemory0, int *m_pathMemory1, in
 }; // end function ViterbiDecode


-// function FECdecoder 
+// function FECdecoder
 // returns outlen
 int FECdecoder (int * in, int * out) {
 int outLen;
--- a/include/dsd.h
+++ b/include/dsd.h
@@ -17,8 +17,8 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

-//defined by CMakeLists.txt -- Disable by using cmake -DCOLORS=OFF ..
-#ifdef PRETTY_COLORS
+//ANSII Color Characters in Terminal -- Disable by using cmake -DCOLORSLOGS=OFF ..
+#ifdef PRETTY_COLORS_LOGS
 #define KNRM  "\x1B[0m"
 #define KRED  "\x1B[31m"
 #define KGRN  "\x1B[32m"
@@ -88,6 +88,48 @@

 extern volatile uint8_t exitflag; //fix for issue #136

+//event history (each item)
+typedef struct {
+  uint8_t write;      //if this event needs to be written to a log file
+  uint8_t color_pair; //this value corresponds to which color pair the line should be in ncurses
+  int8_t systype;     //indentifier of which decoded system type this is from (P25, DMR, etc)
+  int8_t subtype;     //subtype of systpe (VLC, TLC, PDU data, System Event, etc)
+  uint32_t sys_id1;   //sys_id1 through 5 will be a hierarchy of system identifiers
+  uint32_t sys_id2;   //for example, trunked P25 has WACN:SYS:CC:SITE_ID:RFSS_ID
+  uint32_t sys_id3;   //conventional may only use NAC, RAN, or Color Codes
+  uint32_t sys_id4;   //
+  uint32_t sys_id5;   //
+  int8_t gi;          //group or individual
+  uint8_t enc;        //clear or encrypted
+  uint8_t enc_alg;    //alg if encrypted
+  uint16_t enc_key;   //enc key id value, if encrypted (not key value or key variable)
+  uint64_t mi;        //mi, or iv base value from OTA if provided
+  uint16_t svc;       //other relevant svc opts if applicable
+  uint32_t source_id; //source radio id or other source value
+  uint32_t target_id; //group or individual target, or destination value
+  char src_str[200];  //source, expressed as a string for M17, YSF, DSTAR, dPMR
+  char tgt_str[200];  //target, expressed as a string for M17, YSF, DSTAR, dPMR
+  char t_name[200];   //this is the string present from any csv groupName import 
+  char s_name[200];   //same as above, but if loaded from a src value and not tg value
+  char t_mode[200];   //mode, or A,B,D,DE from csv group import file
+  char s_mode[200];   //mode, or A,B,D,DE from csv group import file
+  uint32_t channel;   //if this occurs on a trunking channel, which channel
+  time_t event_time;  //time event occurred
+
+  uint8_t pdu[128*24];     //relevant link control, or full PDU if data call (in bytes)
+  char sysid_string[200];  //string comprised of system unique identifiers
+  char alias[2000];        //if this event has a source radio talker alias or similar
+  char gps_s[2000];        //gps, if returned, expressed as a string
+  char text_message[2000]; //if this event is a decoded text message, then it goes here
+  char event_string[2000]; //user legible and printable string for the event that happened
+  char internal_str[2000]; //string that relates to a DSD-FME generated event (ENC LO, error notices, etc)
+} Event_History;
+
+//event history for number of each items above
+typedef struct {
+  Event_History Event_History_Items[255];
+} Event_History_I;
+
 //new audio filter stuff from: https://github.com/NedSimao/FilteringLibrary
 typedef struct {
    float coef[2];
@@ -269,17 +311,21 @@ typedef struct
  FILE *mbe_out_f;
  FILE *mbe_out_fR; //second slot on a TDMA system
  FILE *symbol_out_f;
+  time_t symbol_out_file_creation_time; //time the symbol out file was created
+  uint8_t symbol_out_file_is_auto; //if the user hit the R key
  float audio_gain;
  float audio_gainR;
  float audio_gainA;
  int audio_out;
-  int dmr_stereo_wav;
+  int dmr_stereo_wav;  //per-call wav file use (rename later)
+  int static_wav_file; //single static wav file for decoding duration
  char wav_out_dir[512];
  char wav_out_file[1024];
  char wav_out_fileR[1024];
  char wav_out_file_raw[1024];
  char symbol_out_file[1024];
  char lrrp_out_file[1024];
+  char event_out_file[1024];
  char szNumbers[1024]; //**tera 10/32/64 char str
  short int mbe_out; //flag for mbe out, don't attempt fclose more than once
  short int mbe_outR; //flag for mbe out, don't attempt fclose more than once
@@ -311,10 +357,6 @@ typedef struct
  int ssize;
  int msize;
  int playfiles;
-  int m17encoder;
-  int m17encoderbrt;
-  int m17encoderpkt;
-  int m17decoderip;
  int delay;
  int use_cosine_filter;
  int unmute_encrypted_p25;
@@ -344,9 +386,9 @@ typedef struct
  pa_simple *pulse_digi_dev_outR;
  char pa_input_idx[100];
  char pa_output_idx[100];
-  int use_ncurses_terminal;
-  int ncurses_compact;
-  int ncurses_history;
+  uint8_t use_ncurses_terminal;
+  uint8_t ncurses_compact;
+  uint8_t ncurses_history;
  int reset_state;
  int payload;
  char output_name[1024];
@@ -368,7 +410,6 @@ typedef struct
  short int aggressive_framesync;

  int frame_m17;
-  int inverted_m17;

  FILE *symbolfile;
  int call_alert;
@@ -385,12 +426,6 @@ typedef struct
  int udp_portno;
  char udp_hostname[1024];

-  //M17 UDP for IP frame output
-  int m17_use_ip;     //if enabled, open UDP and broadcast IP frame
-  int m17_portno;    //default is 17000
-  int m17_udp_sock; //actual UDP socket for M17 to send to
-  char m17_hostname[1024];
-
  //tcp socket for SDR++, etc
  int tcp_sockfd;
  int tcp_portno;
@@ -546,6 +581,9 @@ typedef struct
  int lasttgR;
  int lastsrc;
  int lastsrcR;
+  int8_t gi[2]; //group, or private call, per slot
+  uint8_t eh_index;
+  uint8_t eh_slot;
  int nac;
  int errs;
  int errs2;
@@ -584,8 +622,8 @@ typedef struct
  int payload_keyidR;
  int payload_mfid;
  int payload_mfidR;
-  int payload_mi;
-  int payload_miR;
+  unsigned long long int payload_mi;
+  unsigned long long int payload_miR;
  unsigned long long int payload_miN;
  unsigned long long int payload_miP;
  int p25vc;
@@ -594,9 +632,19 @@ typedef struct
  unsigned long long int K2;
  unsigned long long int K3;
  unsigned long long int K4;
-  int M;
+  uint8_t forced_alg_id;
  int menuopen;

+  //AES Key Segments
+  unsigned long long int A1[2];
+  unsigned long long int A2[2];
+  unsigned long long int A3[2];
+  unsigned long long int A4[2];
+  int aes_key_loaded[2];
+
+  //xl specific, we need to know if the ESS is from HDU, or from LDU2
+  int xl_is_hdu;
+
  unsigned int debug_audio_errors;
  unsigned int debug_audio_errorsR;
  unsigned int debug_header_errors;
@@ -617,6 +665,7 @@ typedef struct
  short pulse_raw_out_buffer; //HERE HERE

  unsigned int dmr_color_code;
+  unsigned int dmr_t3_syscode;
  unsigned int nxdn_last_ran;
  unsigned int nxdn_last_rid;
  unsigned int nxdn_last_tg;
@@ -625,6 +674,7 @@ typedef struct
  char nxdn_call_type[1024];

  unsigned long long int dmr_lrrp_source[2];
+  unsigned long long int dmr_lrrp_target[2];

  NxdnElementsContent_t NxdnElementsContent;

@@ -661,6 +711,9 @@ typedef struct

  //new stuff below here
  uint8_t data_conf_data[2];            //flag for confirmed data blocks per slot
+  uint8_t data_block_poc[2];            //padding octets in the header (needed for Data PDU Decryption)
+  uint16_t data_byte_ctr[2];            //number of bytes acculumated
+  uint8_t data_ks_start[2];             //where the start of the keystream should be applied to PDU data
  uint8_t dmr_pdu_sf[2][24*128];        //unified pdu 'superframe' //[slot][byte] -- increased capacity to 127(+1) full rate blocks
  uint8_t cap_plus_csbk_bits[2][12*8*8]; //CSBK Cap+ FL initial and appended block bit storage, by slot
  uint8_t cap_plus_block_num[2];         //received block number storage -- per timeslot
@@ -672,17 +725,23 @@ typedef struct

  //dmr talker alias new/fixed stuff
  uint8_t dmr_alias_format[2]; //per slot
-  uint8_t dmr_alias_len[2]; //per slot
+  uint8_t dmr_alias_block_len[2]; //per slot
+  uint8_t dmr_alias_char_size[2]; //per slot
  char dmr_alias_block_segment[2][4][7][16]; //2 slots, by 4 blocks, by up to 7 alias bytes that are up to 16-bit chars
-  char dmr_embedded_gps[2][200]; //2 slots by 99 char string for string embedded gps
-  char dmr_lrrp_gps[2][200]; //2 slots by 99 char string for string lrrp gps
+  char dmr_embedded_gps[2][600]; //2 slots by 99 char string for string embedded gps
+  char dmr_lrrp_gps[2][600]; //2 slots by 99 char string for string lrrp gps
  char dmr_site_parms[200]; //string for site/net info depending on type of DMR system (TIII or Con+)
  char call_string[2][200]; //string for call information
  char active_channel[31][200]; //string for storing and displaying active trunking channels

+  //Generic Talker Alias String
+  char generic_talker_alias[2][500];

  dPMRVoiceFS2Frame_t dPMRVoiceFS2Frame;

+  //event history itemized per slot
+  Event_History_I * event_history_s;
+
  //new audio filter structs
  LPFilter RCFilter;
  HPFilter HRCFilter;
@@ -712,6 +771,23 @@ typedef struct
  int DMRvcL;
  int DMRvcR;

+  //keystream octet and bit arrays
+  uint8_t ks_octetL[129*18]; //arbitary size, but large enough for the largest packed PDUs
+  uint8_t ks_octetR[129*18]; //arbitary size, but large enough for the largest packed PDUs
+  uint8_t ks_bitstreamL[128*18*8]; //arbitary size, but large enough for the largest PDUs
+  uint8_t ks_bitstreamR[129*18*8]; //arbitary size, but large enough for the largest PDUs
+  int octet_counter;
+  long int bit_counterL;
+  long int bit_counterR;
+
+  //AES Specific Variables
+  uint8_t aes_key[32]; //was 64 for some reason
+  uint8_t aes_iv[16];
+  uint8_t aes_ivR[16];
+
+  //NXDN DES and AES, signal new VCALL_IV and new IV
+  uint8_t nxdn_new_iv; //1 when a new IV comes in, else 0
+
  short int dmr_encL;
  short int dmr_encR;

@@ -761,6 +837,8 @@ typedef struct

  unsigned short esk_mask;
  unsigned long long int edacs_site_id;
+  uint32_t edacs_sys_id;
+  uint32_t edacs_area_code;
  int edacs_lcn_count; //running tally of lcn's observed on edacs system
  int edacs_cc_lcn; //current lcn for the edacs control channel
  int edacs_vc_lcn; //current lcn for any active vc (not the one we are tuned/tuning to)
@@ -809,6 +887,7 @@ typedef struct
  uint8_t nxdn_sacch_frame_segcrc[4];
  uint8_t nxdn_alias_block_number;
  char nxdn_alias_block_segment[4][4][8];
+  uint16_t nxdn_pn95_seed;

  //site/srv/cch info
  char nxdn_location_category[14];
@@ -822,7 +901,7 @@ typedef struct
  uint8_t nxdn_bw;

  //multi-key array
-  unsigned long long int rkey_array[0xFFFF];
+  unsigned long long int rkey_array[0x1FFFF];
  int keyloader; //let us know the keyloader is active

  //dmr late entry mi
@@ -863,15 +942,11 @@ typedef struct
  //M17 Storage
  uint8_t m17_lsf[360];
  uint8_t m17_pkt[850];
-  uint8_t m17_pbc_ct; //pbc packet counter
  uint8_t m17_str_dt; //stream contents

  unsigned long long int m17_dst;
  unsigned long long int m17_src;
  uint8_t m17_can; //can value that was decoded from signal
-  int m17_can_en; //can value supplied to the encoding side
-  int m17_rate;  //sampling rate for audio input
-  int m17_vox;  //vox enabled via RMS value

  char m17_dst_csd[20];
  char m17_src_csd[20];
@@ -879,18 +954,22 @@ typedef struct
  char m17_src_str[50];
  char m17_dst_str[50];

-  uint8_t m17_meta[16]; //packed meta
-  uint8_t m17_enc;      //enc type
-  uint8_t m17_enc_st;   //scrambler or data subtye
-  int m17encoder_tx;    //if TX (encode + decode) M17 Stream is enabled
-  int m17encoder_eot;   //signal if we need to send the EOT frame
+  uint8_t m17_meta[16];    //packed meta
+  uint8_t m17_aes_iv[16]; //aes iv
+  uint8_t m17_enc;        //enc type
+  uint8_t m17_enc_st;    //scrambler or data subtye
+
+  char m17_text_string[1024];
+  char m17_gnss_string[1024];
+  char m17_data_string[1024];
+  char m17_meta_string[1024];
+
+  float m17_viterbi_err;

  //misc str storage
  char str50a[50];
  char str50b[50];
  char str50c[50];
-  char m17dat[50];  //user supplied m17 data input string
-  char m17sms[800]; //user supplied sms text string

  //Codec2
  #ifdef USE_CODEC2
@@ -898,6 +977,33 @@ typedef struct
  struct CODEC2 *codec2_1600; //M17 halfrate
  #endif

+  //tyt_ap=1 active  
+  int tyt_ap;
+  int tyt_bp;
+  int tyt_ep;
+  // retrevis rc2
+  int retevis_ap;
+  void *rc2_context;
+
+  //kenwood scrambler on DMR with forced application
+  int ken_sc;
+
+  //anytone bp
+  int any_bp;
+
+  //baofeng ap
+  int baofeng_ap;
+
+  //connect systems ee
+  int csi_ee;
+
+  //generic ks
+  int straight_ks;
+  int straight_mod;
+
+  uint8_t static_ks_bits[2][882];
+  int static_ks_counter[2];
+
 } dsd_state;

 /*
@@ -907,13 +1013,6 @@ typedef struct
 //M17 Sync Patterns
 #define M17_LSF     "11113313"
 #define M17_STR     "33331131"
-//alternating with last symbol opposite of first symbol of LSF
-#define M17_PRE     "31313131"
-#define M17_PIV     "13131313"
-#define M17_PRE_LSF "3131313133331131" //Preamble + LSF
-#define M17_PIV_LSF "1313131311113313" //Preamble + LSF
-#define M17_BRT     "31331111"
-#define M17_PKT     "13113333"

 #define FUSION_SYNC     "31111311313113131131"
 #define INV_FUSION_SYNC "13333133131331313313"
@@ -1019,6 +1118,7 @@ void closePulseInput (dsd_opts * opts);
 void closePulseOutput (dsd_opts * opts);
 void writeSynthesizedVoice (dsd_opts * opts, dsd_state * state);
 void writeSynthesizedVoiceR (dsd_opts * opts, dsd_state * state);
+void writeSynthesizedVoiceMS (dsd_opts * opts, dsd_state * state); //short mono to stereo wav file
 void playSynthesizedVoice (dsd_opts * opts, dsd_state * state);   //short mono output slot 1
 void playSynthesizedVoiceR (dsd_opts * opts, dsd_state * state);  //short mono output slot 2
 //new float stuff
@@ -1050,6 +1150,9 @@ void pa_sourcelist_cb (pa_context *c, const pa_source_info *l, int eol, void *us
 int pa_get_devicelist (pa_devicelist_t *input, pa_devicelist_t *output);
 int pulse_list();

+//parse a user string into a uint8_t array
+uint16_t parse_raw_user_string (char * input, uint8_t * output);
+
 int getDibit (dsd_opts * opts, dsd_state * state);
 int get_dibit_and_analog_signal (dsd_opts * opts, dsd_state * state, int * out_analog_signal);
 int digitize (dsd_opts* opts, dsd_state* state, int symbol);
@@ -1062,6 +1165,11 @@ void PrintAMBEData (dsd_opts * opts, dsd_state * state, char *ambe_d);
 void PrintIMBEData (dsd_opts * opts, dsd_state * state, char *imbe_d);
 int readImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d);
 int readAmbe2450Data (dsd_opts * opts, dsd_state * state, char *ambe_d);
+void keyring(dsd_opts * opts, dsd_state * state);
+void read_sdrtrunk_json_format (dsd_opts * opts, dsd_state * state);
+void ambe2_codeword_print_f (dsd_opts * opts, char ambe_fr[4][24]);
+void ambe2_codeword_print_b (dsd_opts * opts, char ambe_fr[4][24]);
+void ambe2_codeword_print_i (dsd_opts * opts, char ambe_fr[4][24]);
 void openMbeInFile (dsd_opts * opts, dsd_state * state);
 void closeMbeOutFile (dsd_opts * opts, dsd_state * state);
 void closeMbeOutFileR (dsd_opts * opts, dsd_state * state); //tdma slot 2
@@ -1070,9 +1178,15 @@ void openMbeOutFileR (dsd_opts * opts, dsd_state * state); //tdma slot 2
 void openWavOutFile (dsd_opts * opts, dsd_state * state);
 void openWavOutFileL (dsd_opts * opts, dsd_state * state);
 void openWavOutFileR (dsd_opts * opts, dsd_state * state);
+void openWavOutFileLR (dsd_opts * opts, dsd_state * state); //stereo wav file for tdma decoded speech
 void openWavOutFileRaw (dsd_opts * opts, dsd_state * state);
+SNDFILE * open_wav_file (char * dir, char * temp_filename, uint16_t sample_rate, uint8_t ext);
+SNDFILE * close_wav_file(SNDFILE * wav_file);
+SNDFILE * close_and_rename_wav_file(SNDFILE * wav_file, char * wav_out_filename, char * dir, Event_History_I * event_struct);
+SNDFILE * close_and_delete_wav_file(SNDFILE * wav_file, char * wav_out_filename);
 void openSymbolOutFile (dsd_opts * opts, dsd_state * state);
 void closeSymbolOutFile (dsd_opts * opts, dsd_state * state);
+void rotate_symbol_out_file (dsd_opts * opts, dsd_state * state);
 void writeRawSample (dsd_opts * opts, dsd_state * state, short sample);
 void closeWavOutFile (dsd_opts * opts, dsd_state * state);
 void closeWavOutFileL (dsd_opts * opts, dsd_state * state);
@@ -1122,13 +1236,6 @@ void processDSTAR_HD (dsd_opts * opts, dsd_state * state); //DSTAR Header
 void processDSTAR_SD (dsd_opts * opts, dsd_state * state, uint8_t * sd); //DSTAR Slow Data
 void processYSF(dsd_opts * opts, dsd_state * state); //YSF
 void processM17STR(dsd_opts * opts, dsd_state * state); //M17 (STR)
-void processM17PKT(dsd_opts * opts, dsd_state * state); //M17 (PKT)
-void processM17LSF(dsd_opts * opts, dsd_state * state); //M17 (LSF)
-void processM17IPF(dsd_opts * opts, dsd_state * state); //M17 (IPF)
-void encodeM17STR(dsd_opts * opts, dsd_state * state); //M17 (STR) encoder
-void encodeM17BRT(dsd_opts * opts, dsd_state * state); //M17 (BRT) encoder
-void encodeM17PKT(dsd_opts * opts, dsd_state * state); //M17 (PKT) encoder
-void decodeM17PKT(dsd_opts * opts, dsd_state * state, uint8_t * input, int len); //M17 (PKT) decoder
 void processP2(dsd_opts * opts, dsd_state * state); //P2
 void processTSBK(dsd_opts * opts, dsd_state * state); //P25 Trunking Single Block
 void processMPDU(dsd_opts * opts, dsd_state * state); //P25 Multi Block PDU (SAP 0x61 FMT 0x15 or 0x17 for Trunking Blocks)
@@ -1150,11 +1257,13 @@ void unpack_ambe (uint8_t * input, char * ambe);

 void ncursesOpen (dsd_opts * opts, dsd_state * state);
 void ncursesPrinter (dsd_opts * opts, dsd_state * state);
+void ncursesMenu (dsd_opts * opts, dsd_state * state);
+uint8_t ncurses_input_handler(dsd_opts * opts, dsd_state * state, int c);
 void ncursesClose ();

 //new NXDN Functions start here!
 void nxdn_frame (dsd_opts * opts, dsd_state * state);
-void nxdn_descramble (uint8_t dibits[], int len);
+void nxdn_pn95_dibit_scrambler(dsd_state * state, uint8_t * dibits, int len);
 //nxdn deinterleaving/depuncturing functions
 void nxdn_deperm_facch (dsd_opts * opts, dsd_state * state, uint8_t bits[144]);
 void nxdn_deperm_sacch (dsd_opts * opts, dsd_state * state, uint8_t bits[60]);
@@ -1163,7 +1272,10 @@ void nxdn_deperm_facch2_udch (dsd_opts * opts, dsd_state * state, uint8_t bits[3
 //type-d 'idas' deinterleaving/depuncturing functions
 void nxdn_deperm_scch(dsd_opts * opts, dsd_state * state, uint8_t bits[60], uint8_t direction);
 void nxdn_deperm_facch3_udch2(dsd_opts * opts, dsd_state * state, uint8_t bits[288], uint8_t type);
-//end
+//DCR Mode
+void nxdn_deperm_sacch2(dsd_opts * opts, dsd_state * state, uint8_t bits[60]);
+void nxdn_deperm_pich_tch(dsd_opts * opts, dsd_state * state, uint8_t bits[144], uint8_t lich);
+//MT and Voice
 void nxdn_message_type (dsd_opts * opts, dsd_state * state, uint8_t MessageType);
 void nxdn_voice (dsd_opts * opts, dsd_state * state, int voice, uint8_t dbuf[182]);
 //Osmocom OP25 12 Rate Trellis Decoder (for NXDN, M17, YSF, etc)
@@ -1185,6 +1297,12 @@ void CNXDNConvolution_encode(const unsigned char* in, unsigned char* out, unsign
 void CNXDNConvolution_init();

 //libM17 viterbi decoder
+
+//libm17 magic soft decision based viterbi
+#define SYM_PER_PLD 184
+void slice_symbols(uint16_t out[2*SYM_PER_PLD], const float inp[SYM_PER_PLD]);
+void randomize_soft_bits(uint16_t inp[SYM_PER_PLD*2]);
+void reorder_soft_bits(uint16_t outp[SYM_PER_PLD*2], const uint16_t inp[SYM_PER_PLD*2]);
 uint32_t viterbi_decode(uint8_t* out, const uint16_t* in, const uint16_t len);
 uint32_t viterbi_decode_punctured(uint8_t* out, const uint16_t* in, const uint8_t* punct, const uint16_t in_len, const uint16_t p_len);
 void viterbi_decode_bit(uint16_t s0, uint16_t s1, const size_t pos);
@@ -1210,6 +1328,10 @@ void NXDN_decode_site_info(dsd_opts * opts, dsd_state * state, uint8_t * Message
 void NXDN_decode_adj_site(dsd_opts * opts, dsd_state * state, uint8_t * Message);
 //Type-D SCCH Message Decoder
 void NXDN_decode_scch(dsd_opts * opts, dsd_state * state, uint8_t * Message, uint8_t direction);
+void NXDN_decode_VCALL_ARIB(dsd_opts * opts, dsd_state * state, uint8_t * Message);
+void NXDN_decode_ALIAS_ARIB(dsd_opts * opts, dsd_state * state, uint8_t * Message);
+uint32_t sjis_char_to_unicode(uint16_t sjis);
+int utf8_encode(int c, char *buf);

 void dPMRVoiceFrameProcess(dsd_opts * opts, dsd_state * state);

@@ -1235,7 +1357,7 @@ rs_12_9_checksum_t *rs_12_9_calc_checksum(rs_12_9_codeword_t *codeword);

 //DMR CRC Functions
 uint16_t ComputeCrcCCITT(uint8_t * DMRData);
-uint16_t ComputeCrcCCITT16d(const uint8_t buf[], uint8_t len);
+uint16_t ComputeCrcCCITT16d(const uint8_t * buf, uint32_t len);
 uint32_t ComputeAndCorrectFullLinkControlCrc(uint8_t * FullLinkControlDataBytes, uint32_t * CRCComputed, uint32_t CRCMask);
 uint8_t ComputeCrc5Bit(uint8_t * DMRData);
 uint16_t ComputeCrc9Bit(uint8_t * DMRData, uint32_t NbData);
@@ -1245,23 +1367,36 @@ uint32_t ComputeCrc32Bit(uint8_t * DMRData, uint32_t NbData);
 void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196], uint8_t databurst);
 void dmr_data_sync (dsd_opts * opts, dsd_state * state);
 void dmr_pi (dsd_opts * opts, dsd_state * state, uint8_t PI_BYTE[], uint32_t CRCCorrect, uint32_t IrrecoverableErrors);
-void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t CRCCorrect, uint32_t IrrecoverableErrors, uint8_t type);
+void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t CRCCorrect, uint32_t * IrrecoverableErrors, uint8_t type);
 void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8_t cs_pdu[], uint32_t CRCCorrect, uint32_t IrrecoverableErrors);
 void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[]);
 uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25]);
 uint32_t dmr_34(uint8_t * input, uint8_t treturn[18]); //simplier trellis decoder
-void beeper (dsd_opts * opts, dsd_state * state, int lr); //the tone beeper function
+void beeper (dsd_opts * opts, dsd_state * state, int lr, int id, int ad, int len);
 void dmr_gateway_identifier (uint32_t source, uint32_t target); //translate special addresses

 //Embedded Alias and GPS reports
-void dmr_embedded_alias_header (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[]);
-void dmr_embedded_alias_blocks (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[]);
+void dmr_talker_alias_lc_header (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t * lc_bits);
+void dmr_talker_alias_lc_blocks (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t block_num, uint8_t * lc_bits);
+void dmr_talker_alias_lc_decode (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t block_num, uint8_t char_size, uint16_t end);
+void apx_embedded_alias_test_phase1 (dsd_opts * opts, dsd_state * state);
+void apx_embedded_alias_header_phase1 (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t * lc_bits);
+void apx_embedded_alias_header_phase2 (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t * lc_bits);
+void apx_embedded_alias_blocks_phase1 (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t * lc_bits);
+void apx_embedded_alias_blocks_phase2 (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t * lc_bits);
+void apx_embedded_alias_decode (dsd_opts * opts, dsd_state * state, uint8_t slot, int16_t num_bits, uint8_t * input);
+void apx_embedded_alias_dump (dsd_opts * opts, dsd_state * state, uint8_t slot, uint16_t num_bytes, uint8_t * input, uint8_t * decoded);
+void l3h_embedded_alias_blocks_phase1 (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t * lc_bits);
+void l3h_embedded_alias_decode (dsd_opts * opts, dsd_state * state, uint8_t slot, int16_t len, uint8_t * input);
+void tait_iso7_embedded_alias_decode (dsd_opts * opts, dsd_state * state, uint8_t slot, int16_t len, uint8_t * input);
 void dmr_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[]);
 void apx_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[]);
 void lip_protocol_decoder (dsd_opts * opts, dsd_state * state, uint8_t * input);
 void nmea_iec_61162_1 (dsd_opts * opts, dsd_state * state, uint8_t * input, uint32_t src, int type);
 void nmea_harris (dsd_opts * opts, dsd_state * state, uint8_t * input, uint32_t src, int slot);
 void harris_gps(dsd_opts * opts, dsd_state * state, int slot, uint8_t * input);
+void utf16_to_text (dsd_state * state, uint8_t wr, uint16_t len, uint8_t * input);
+void utf8_to_text (dsd_state * state, uint8_t wr, uint16_t len, uint8_t * input);

 //"DMR STEREO"
 void dmrBSBootstrap (dsd_opts * opts, dsd_state * state);
@@ -1273,18 +1408,53 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state);
 //dmr data header and multi block types (header, 1/2, 3/4, 1, Unified)
 void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint8_t dheader_bits[], uint32_t CRCCorrect, uint32_t IrrecoverableErrors);
 void dmr_block_assembler (dsd_opts * opts, dsd_state * state, uint8_t block_bytes[], uint8_t block_len, uint8_t databurst, uint8_t type);
-void dmr_pdu (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DMR_PDU[]);
+
+//dmr pdu handling
+void dmr_sd_pdu (dsd_opts * opts, dsd_state * state, uint16_t len, uint8_t * DMR_PDU);
+void dmr_udp_comp_pdu (dsd_opts * opts, dsd_state * state, uint16_t len, uint8_t * DMR_PDU);
 void dmr_reset_blocks (dsd_opts * opts, dsd_state * state);
-void dmr_lrrp (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DMR_PDU[]);
-void dmr_locn (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DMR_PDU[]);
+void dmr_lrrp (dsd_opts * opts, dsd_state * state, uint16_t len, uint32_t source, uint32_t dest, uint8_t * DMR_PDU);
+void dmr_locn (dsd_opts * opts, dsd_state * state, uint16_t len, uint8_t * DMR_PDU);
+
+//p25 pdu handling
+uint8_t p25_decrypt_pdu(dsd_opts * opts, dsd_state * state, uint8_t * input, uint8_t alg_id, uint16_t key_id, unsigned long long int mi, int len);
+uint8_t p25_decode_es_header(dsd_opts * opts, dsd_state * state, uint8_t * input, uint8_t * sap, int * ptr, int len);
+uint8_t p25_decode_es_header_2(dsd_opts * opts, dsd_state * state, uint8_t * input, int * ptr, int len);
+void p25_decode_extended_address(dsd_opts * opts, dsd_state * state, uint8_t * input, uint8_t * sap, int * ptr);
+void p25_decode_pdu_trunking(dsd_opts * opts, dsd_state * state, uint8_t * mpdu_byte);
+void p25_decode_pdu_header(dsd_opts * opts, dsd_state * state, uint8_t * input);
+void p25_decode_pdu_data(dsd_opts * opts, dsd_state * state, uint8_t * input, int len);
+void p25_decode_rsp(uint8_t C, uint8_t T, uint8_t S, char * rsp_string);
+void p25_decode_sap(uint8_t SAP, char * sap_string);
+
+//misc pdu
+void decode_ip_pdu (dsd_opts * opts, dsd_state * state, uint16_t len, uint8_t * input);
+void decode_cellocator(dsd_opts * opts, dsd_state * state, uint8_t * input, int len);
+void decode_ars(dsd_opts * opts, dsd_state * state, uint8_t * input, int len);

 //Time and Date Functions
 char * getTime();
 char * getTimeC();
 char * getTimeN(time_t t);
+char * getTimeF(time_t t);
 char * getDate();
 char * getDateH();
+char * getDateS();
 char * getDateN(time_t t);
+char * getDateF(time_t t);
+
+//event history functions
+void init_event_history (Event_History_I * event_struct, uint8_t start, uint8_t stop);
+void push_event_history (Event_History_I * event_struct);
+void write_event_to_log_file (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t swrite, char * event_string);
+void watchdog_event_history (dsd_opts * opts, dsd_state * state, uint8_t slot);
+void watchdog_event_current (dsd_opts * opts, dsd_state * state, uint8_t slot);
+void watchdog_event_datacall (dsd_opts * opts, dsd_state * state, uint32_t src, uint32_t dst, char * data_string, uint8_t slot);
+
+//edacs AFS things
+int isCustomAfsString(dsd_state * state);
+int getAfsStringLength(dsd_state * state);
+int getAfsString(dsd_state * state, char * buffer, int a, int f, int s);

 //dmr alg stuff
 void dmr_alg_reset (dsd_opts * opts, dsd_state * state);
@@ -1434,9 +1604,49 @@ int udp_socket_connect(dsd_opts * opts, dsd_state * state);
 int udp_socket_connectA(dsd_opts * opts, dsd_state * state);
 void udp_socket_blaster(dsd_opts * opts, dsd_state * state, size_t nsam, void * data);
 void udp_socket_blasterA(dsd_opts * opts, dsd_state * state, size_t nsam, void * data);
-int m17_socket_receiver(dsd_opts * opts, void * data);
-int udp_socket_connectM17(dsd_opts * opts, dsd_state * state);
-int m17_socket_blaster(dsd_opts * opts, dsd_state * state, size_t nsam, void * data);
+
+//RC4 function prototypes
+void rc4_voice_decrypt (int drop, uint8_t keylength, uint8_t messagelength, uint8_t key[], uint8_t cipher[], uint8_t plain[]);
+void rc4_block_output (int drop, int keylen, int meslen, uint8_t * key, uint8_t * output_blocks);
+
+//DES function prototypes
+void des_multi_keystream_output (unsigned long long int mi, unsigned long long int key_ulli, uint8_t * output, int type, int len);
+void tdea_multi_keystream_output (unsigned long long int mi, uint8_t * key, uint8_t * output, int type, int len);
+
+//AES function prototypes
+void aes_ofb_keystream_output (uint8_t * iv, uint8_t * key, uint8_t * output, int type, int nblocks);
+void aes_ecb_bytewise_payload_crypt (uint8_t * input, uint8_t * key, uint8_t * output, int type, int de);
+void aes_cbc_bytewise_payload_crypt (uint8_t * iv, uint8_t * key, uint8_t * in, uint8_t * out, int type, int nblocks, int de);
+void aes_cfb_bytewise_payload_crypt (uint8_t * iv, uint8_t * key, uint8_t * in, uint8_t * out, int type, int nblocks, int de);
+void aes_ctr_bytewise_payload_crypt (uint8_t * iv, uint8_t * key, uint8_t * payload, int type);
+void aes_ctr_bitwise_payload_crypt (uint8_t * iv, uint8_t * key, uint8_t * payload, int type);
+
+//Tytera / Retevis / Anytone / Kenwood / Misc DMR Encryption Modes
+void tyt16_ambe2_codeword_keystream(dsd_state * state, char ambe_fr[4][24], int fnum);
+void tyt_ep_aes_keystream_creation(dsd_state * state, char * input);
+void tyt_ap_pc4_keystream_creation(dsd_state * state, char * input);
+void retevis_rc2_keystream_creation(dsd_state *state, char *input);
+void ken_dmr_scrambler_keystream_creation(dsd_state * state, char * input);
+void anytone_bp_keystream_creation(dsd_state * state, char * input);
+void baofeng_ap_pc5_keystream_creation(dsd_state *state, char *input);
+void csi72_ambe2_codeword_keystream(dsd_state * state, char ambe_fr[4][24]);
+void straight_mod_xor_keystream_creation(dsd_state * state, char * input);
+
+//Kirisun
+uint32_t kirisun_lfsr(unsigned long long int mi);
+void kirisun_adv_keystream_creation(dsd_state *state);
+void kirisun_uni_keystream_creation(dsd_state *state);
+
+//Hytera Enhanced
+void hytera_enhanced_rc4_setup(dsd_opts * opts, dsd_state * state, unsigned long long int key_value, unsigned long long int mi_value);
+unsigned long long int hytera_lfsr(uint8_t * mi, uint8_t * taps, uint8_t len);
+void hytera_enhanced_alg_refresh(dsd_state * state);
+
+//LFSR to expand either a DMR 32-bit or P25/NXDN 64-bit MI into a 128-bit IV for AES
+void LFSR128(dsd_state * state);
+void LFSR128n(dsd_state * state);
+void LFSR128d(dsd_state * state);
+

 #ifdef __cplusplus
 extern "C" {
--- a/include/dstar_const.h
+++ b/include/dstar_const.h
@@ -16,7 +16,7 @@
 */

 /*
- *  dstar interleave experiments 
+ *  dstar interleave experiments
 */

 #ifndef _MAIN
--- a/include/fcs.h
+++ b/include/fcs.h
@@ -1,6 +1,6 @@
 /* fcs.h */

-// Viterbi decoder using Traceback method. 
+// Viterbi decoder using Traceback method.

 // Original Source was written by Sho Tamaoki and Tom Wada
 // See http://www.lsi.ie.u-ryukyu.ac.jp/~sho/midterm/
@@ -86,4 +86,4 @@ m_crc = (m_crc << 8) | (tmp >> 8 & 0xFF);

 // done
 return(m_crc);
-}; // end function 
+}; // end function
--- a/include/nxdn_const.h
+++ b/include/nxdn_const.h
@@ -5,12 +5,12 @@
 // under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 3, or (at your option)
 // any later version.
-// 
+//
 // OP25 is distributed in the hope that it will be useful, but WITHOUT
 // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 // or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
 // License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with OP25; see the file COPYING. If not, write to the Free
 // Software Foundation, Inc., 51 Franklin Street, Boston, MA
--- a/include/pc4.h
+++ b/include/pc4.h
@@ -0,0 +1,95 @@
+#include <stdint.h>
+#include <stddef.h>
+
+#ifndef TYT_AP
+#define TYT_AP
+
+#define nbround 254
+#define n1 264
+
+#define UNUSEDPC4(x)                       ((void)x)
+
+/* Structure holding all PC4 state variables */
+typedef struct {
+    short bits[49], temp[49];
+    uint8_t ptconvert;
+    uint8_t convert[7];
+    uint8_t perm[16][256];
+    uint8_t new1[256];
+    uint8_t array[49];
+    uint8_t array2[49];
+    uint8_t decal[nbround];
+    uint8_t rngxor[nbround][3];
+    uint8_t rngxor2[nbround][3];
+    uint8_t rounds;
+    uint8_t tab[256];
+    uint8_t inv[256];
+    uint8_t permut[3][3];
+    uint64_t bb;
+    uint64_t x;
+    uint8_t tot[3];
+    uint8_t l[2][3], r[2][3];
+    uint8_t y, totb;
+    uint32_t result;
+    uint8_t xyz, count;
+    uint8_t keys[16];
+    unsigned char array_arc4[256];
+    int i_arc4, j_arc4;
+    int x1, x2, i;
+    unsigned char h2[n1];
+    unsigned char h1[n1*3];
+} PC4Context;
+
+/* Global context accessible from all .c files */
+extern PC4Context ctx;
+
+/* Public API */
+void create_keys(PC4Context *ctx, unsigned char key1[], size_t size1);
+void pc4encrypt(PC4Context *ctx);
+void pc4decrypt(PC4Context *ctx);
+void binhex(PC4Context *ctx, short *z, int length);
+void hexbin(PC4Context *ctx, short *q, uint8_t w, uint8_t hex);
+static void u64_to_bytes_be(uint64_t val, unsigned char *out);
+
+/* Encrypt a 49-bit frame (original flow) */
+static void encrypt_frame_49(short frame_bits_in[49]) {
+    for (int i = 0; i < 49; i++) ctx.bits[i] = frame_bits_in[i];
+    for (int i = 0; i < 49; i++) ctx.temp[i] = ctx.bits[ctx.array[i]];
+    for (int i = 0; i < 49; i++) ctx.bits[i] = ctx.temp[i];
+    ctx.ptconvert = 0;
+    binhex(&ctx, ctx.bits, 48);
+    pc4encrypt(&ctx);
+    for (int q = 0; q < 6; q++) {
+        uint8_t w = (uint8_t)(q * 8);
+        hexbin(&ctx, ctx.bits, w, ctx.convert[q]);
+    }
+    ctx.bits[48] = (short)(ctx.bits[48] ^ ctx.totb);
+    for (int i = 0; i < 49; i++) ctx.temp[ctx.array2[i]] = ctx.bits[i];
+    for (int i = 0; i < 49; i++) ctx.bits[i] = ctx.temp[i];
+}
+
+/* Decrypt a 49-bit frame (original flow) */
+static void decrypt_frame_49(short frame_bits_in[49]) {
+    for (int i = 0; i < 49; i++) ctx.bits[i] = frame_bits_in[i];
+    for (int i = 0; i < 49; i++) ctx.temp[i] = ctx.bits[ctx.array2[i]];
+    for (int i = 0; i < 49; i++) ctx.bits[i] = ctx.temp[i];
+    ctx.ptconvert = 0;
+    binhex(&ctx, ctx.bits, 48);
+    pc4decrypt(&ctx);
+    for (int q = 0; q < 6; q++) {
+        uint8_t w = (uint8_t)(q * 8);
+        hexbin(&ctx, ctx.bits, w, ctx.convert[q]);
+    }
+    ctx.bits[48] = (short)(ctx.bits[48] ^ ctx.totb);
+    for (int i = 0; i < 49; i++) ctx.temp[ctx.array[i]] = ctx.bits[i];
+    for (int i = 0; i < 49; i++) ctx.bits[i] = ctx.temp[i];
+}
+
+/* Convert 64-bit integer to bytes (big-endian) */
+static void u64_to_bytes_be(uint64_t val, unsigned char *out) {
+    for (int i = 0; i < 8; i++) {
+        out[i] = (unsigned char)((val >> (56 - 8 * i)) & 0xFF);
+    }
+}
+
+#endif
--- a/include/pc5.h
+++ b/include/pc5.h
@@ -0,0 +1,147 @@
+#include <stdint.h>
+#include <stddef.h>
+
+#ifndef BAOFENG_AP
+#define BAOFENG_AP
+
+#define nbround 254
+#define n1 264
+
+#define UNUSEDPC5(x)                       ((void)x)
+
+/* Structure holding all PC5 state variables */
+typedef struct {
+    short bits[49], temp[49];
+    uint8_t ptconvert;
+    uint8_t convert[7];
+    uint8_t perm[16][256];
+    uint8_t new1[256];
+    uint8_t array[49];
+    uint8_t array2[49];
+    uint8_t decal[nbround];
+    uint8_t rngxor[nbround][3];
+    uint8_t rngxor2[nbround][3];
+    uint8_t rounds;
+    uint8_t tab[256];
+    uint8_t inv[256];
+    uint8_t permut[3][3];
+    uint64_t bb;
+    uint64_t x;
+    uint8_t tot[3];
+    uint8_t l[2][3], r[2][3];
+    uint8_t y, totb;
+    uint32_t result;
+    uint8_t xyz, count;
+    uint8_t keys[16];
+    unsigned char array_arc4[256];
+    int i_arc4, j_arc4;
+    int x1, x2, i;
+    unsigned char h2[n1];
+    unsigned char h1[n1*3];
+    uint8_t numbers[25];
+} PC5Context;
+
+/* Global context accessible from all .c files */
+extern PC5Context ctxpc5;
+
+/* Public API */
+void create_keys_pc5(PC5Context *ctxpc5, unsigned char key1[], size_t size1);
+void pc5encrypt(PC5Context *ctxpc5);
+void pc5decrypt(PC5Context *ctxpc5);
+void binhexpc5(PC5Context *ctxpc5, short *z, int length);
+void hexbinpc5(PC5Context *ctxpc5, short *q, uint8_t w, uint8_t hex);
+static void u64_to_bytes_be_pc5(uint64_t val, unsigned char *out);
+
+/* Encrypt a 49-bit frame using PC5 algorithm (original flow) */
+static void encrypt_frame_49_pc5(short frame_bits_in[49]) {
+    // Only process first 24 bits for encryption, rest are XORed
+    ctxpc5.ptconvert = 0;
+    binhexpc5(&ctxpc5, frame_bits_in, 24);
+    
+    uint8_t convert[6];
+    
+    // Store first 3 bytes in convert
+    for (int i = 0; i < 3; i++) convert[i] = ctxpc5.convert[i];
+    
+    // Split each byte into two 4-bit nibbles
+    ctxpc5.convert[0] = convert[0] >> 4;
+    ctxpc5.convert[1] = convert[0] & 0xF;
+    ctxpc5.convert[2] = convert[1] >> 4;
+    ctxpc5.convert[3] = convert[1] & 0xF;
+    ctxpc5.convert[4] = convert[2] >> 4;
+    ctxpc5.convert[5] = convert[2] & 0xF;
+    
+    pc5encrypt(&ctxpc5);
+    
+    // Store encrypted nibbles back in convert
+    for (int i = 0; i < 6; i++) convert[i] = ctxpc5.convert[i];
+    
+    // Recombine nibbles into bytes
+    ctxpc5.convert[0] = (convert[0] << 4) + convert[1];
+    ctxpc5.convert[1] = (convert[2] << 4) + convert[3];
+    ctxpc5.convert[2] = (convert[4] << 4) + convert[5];
+    
+    // Convert back to bits for first 24 bits
+    for (int q = 0; q < 3; q++) {
+        uint8_t w = (uint8_t)(q * 8);
+        hexbinpc5(&ctxpc5, frame_bits_in, w, ctxpc5.convert[q]);
+    }
+    
+    // XOR the remaining bits (positions 24 to 48)
+    for (int i = 24; i < 49; i++) {
+        frame_bits_in[i] = (short)(frame_bits_in[i] ^ ctxpc5.numbers[i - 24]);
+    }
+    
+    for (int i = 0; i < 49; i++) ctxpc5.bits[i] = frame_bits_in[i];
+}
+
+/* Decrypt a 49-bit frame using PC5 algorithm (original flow) */
+static void decrypt_frame_49_pc5(short frame_bits_in[49]) {
+    // XOR the remaining bits (positions 24 to 48) first
+    for (int i = 24; i < 49; i++) {
+        frame_bits_in[i] = (short)(frame_bits_in[i] ^ ctxpc5.numbers[i - 24]);
+    }
+    
+    ctxpc5.ptconvert = 0;
+    binhexpc5(&ctxpc5, frame_bits_in, 24);
+    
+    uint8_t convert[6];
+    
+    // Store first 3 bytes in convert
+    for (int i = 0; i < 3; i++) convert[i] = ctxpc5.convert[i];
+
+    // Split each byte into two 4-bit nibbles
+    ctxpc5.convert[0] = convert[0] >> 4;
+    ctxpc5.convert[1] = convert[0] & 0xF;
+    ctxpc5.convert[2] = convert[1] >> 4;
+    ctxpc5.convert[3] = convert[1] & 0xF;
+    ctxpc5.convert[4] = convert[2] >> 4;
+    ctxpc5.convert[5] = convert[2] & 0xF;
+    
+    pc5decrypt(&ctxpc5);
+    
+    // Store decrypted nibbles back in convert
+    for (int i = 0; i < 6; i++) convert[i] = ctxpc5.convert[i];
+    
+    // Recombine nibbles into bytes
+    ctxpc5.convert[0] = (convert[0] << 4) + convert[1];
+    ctxpc5.convert[1] = (convert[2] << 4) + convert[3];
+    ctxpc5.convert[2] = (convert[4] << 4) + convert[5];
+    
+    // Convert back to bits for first 24 bits
+    for (int q = 0; q < 3; q++) {
+        uint8_t w = (uint8_t)(q * 8);
+        hexbinpc5(&ctxpc5, frame_bits_in, w, ctxpc5.convert[q]);
+    }
+    
+     for (int i = 0; i < 49; i++) ctxpc5.bits[i] = frame_bits_in[i];
+}
+
+/* Convert 64-bit integer to bytes (big-endian) */
+static void u64_to_bytes_be_pc5(uint64_t val, unsigned char *out) {
+    for (int i = 0; i < 8; i++) {
+        out[i] = (unsigned char)((val >> (56 - 8 * i)) & 0xFF);
+    }
+}
+
+#endif
--- a/include/rc2.h
+++ b/include/rc2.h
@@ -0,0 +1,43 @@
+#ifndef RETEVIS_AP
+#define RETEVIS_AP
+
+#include <stdint.h>
+#include "dsd.h"
+
+#define n1 264
+
+typedef struct {
+    uint8_t array_rc4[256];
+    int i_rc4, j_rc4;
+    uint64_t x;
+    uint8_t xyz, count;
+    uint64_t bb;
+} RC4State;
+
+typedef struct {
+    int x1, x2;
+    unsigned char h2[n1];
+    unsigned char h1[n1 * 3];
+} MD2State;
+
+typedef struct {
+    uint16_t xkey[64];
+    uint8_t plain[8];
+    uint8_t cipher[8];
+} RC2State;
+
+typedef struct {
+    RC4State rc4;
+    MD2State md2;
+    RC2State rc2;
+    uint64_t internal_state;
+    uint64_t internal_zero;
+    uint8_t keys[16];
+} CryptoContext;
+
+/* Public API */
+void create_keys_rc2(CryptoContext* ctx, unsigned char key1[], size_t size1);
+void encryption_rc2(CryptoContext* ctx, uint8_t s1[49]);
+void decrypt_rc2(CryptoContext* ctx, uint8_t bits[49]);
+
+#endif
--- a/include/synctype.h
+++ b/include/synctype.h
@@ -0,0 +1,48 @@
+#ifndef SYNCTYPE_H
+#define SYNCTYPE_H
+
+static const char * SyncTypes[44] = {
+  "P25p1",
+  "P25p1",
+  "X2TDMA DATA",
+  "X2TDMA DATA",
+  "X2TDMA VOICE",
+  "X2TDMA VOICE",
+  "DSTAR", //voice
+  "DSTAR", //voice
+  "M17",
+  "M17",
+  "DMR", //10
+  "DMR",
+  "DMR",
+  "DMR",
+  "EDACS/PV",
+  "EDACS/PV",
+  "M17", //M17 Voice Stream
+  "M17", //M17 Voice Stream
+  "DSTAR", //header
+  "DSTAR", //header
+  "dPMR", //20
+  "dPMR",
+  "dPMR",
+  "dPMR",
+  "dPMR",
+  "dPMR",
+  "dPMR",
+  "dPMR",
+  "NXDN",
+  "NXDN",
+  "YSF", //30
+  "YSF", //31
+  "DMR",
+  "DMR",
+  "DMR",
+  "P25p2",
+  "P25p2",
+  "EDACS/PV", //37
+  "EDACS/PV", //38
+  "ANALOG", //39 Generic Sync Types
+  "DIGITAL" //40 Generic Sync Types
+};
+
+#endif
--- a/patch/DMR_MONO_MODE_20240201.patch
+++ b/patch/DMR_MONO_MODE_20240201.patch
@@ -1,51 +0,0 @@
-diff --git a/src/dmr_pi.c b/src/dmr_pi.c
-index 55dfb83..33fb3ba 100644
--- a/src/dmr_pi.c
-+++ b/src/dmr_pi.c
-@@ -14,6 +14,9 @@ void dmr_pi (dsd_opts * opts, dsd_state * state, uint8_t PI_BYTE[], uint32_t CRC
- {
-   UNUSED2(opts, CRCCorrect);
- 
-+  //force slot to 0 if using dmr mono handling
-+  if (opts->dmr_mono == 1) state->currentslot = 0;
-+
-   if((IrrecoverableErrors == 0)) 
-   {
- 
-diff --git a/src/dsd_frame.c b/src/dsd_frame.c
-index 3b2a3e1..ba32618 100644
--- a/src/dsd_frame.c
-+++ b/src/dsd_frame.c
-@@ -160,7 +160,8 @@ processFrame (dsd_opts * opts, dsd_state * state)
-           sprintf (state->slot2light, " slot2 ");
-           //we can safely open MBE on any MS or mono handling
-           if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL)) openMbeOutFile (opts, state); 
-          if (opts->p25_trunk == 0) dmrMSBootstrap (opts, state); 
-+          // if (opts->p25_trunk == 0) //line disabled to allow mono mode while trunking
-+            dmrMSBootstrap (opts, state); 
-         }
-         if (opts->dmr_mono == 1 && state->synctype == 32)
-         {
-diff --git a/src/dsd_main.c b/src/dsd_main.c
-index 7be5912..8db6dc3 100644
--- a/src/dsd_main.c
-+++ b/src/dsd_main.c
-@@ -2302,13 +2302,13 @@ main (int argc, char **argv)
-             state.rf_mod = 0;  //
-             opts.pulse_digi_rate_out = 8000;
-             opts.pulse_digi_out_channels = 2;
-            opts.dmr_mono = 0;
-            opts.dmr_stereo = 1;
-+            opts.dmr_mono = 1;
-+            opts.dmr_stereo = 0; //not sure if this will break anything
-             state.dmr_stereo = 0; //0
-             // opts.setmod_bw = 7000;
-            sprintf (opts.output_name, "DMR Stereo");
-            fprintf (stderr,"-fr / DMR Mono switch has been deprecated.\n");
-            fprintf (stderr,"Decoding DMR Stereo BS/MS Simplex\n");
-+            sprintf (opts.output_name, "DMR Mono");
-+            // fprintf (stderr,"-fr / DMR Mono switch enabled. \n NOTE: Some ENC options in Slot 2 may not work properly.\n");
-+            fprintf (stderr,"\n Decoding DMR Stereo BS/MS Simplex in Mono Single Slot Only Configuration.\n");
- 
-           }
-           else if (optarg[0] == 'm')
--- a/patch/MTL_MONO_MODE_20240328.patch
+++ b/patch/MTL_MONO_MODE_20240328.patch
@@ -1,152 +0,0 @@
-diff --git a/src/dmr_pi.c b/src/dmr_pi.c
-index 7542c61..d1c8e39 100644
--- a/src/dmr_pi.c
-+++ b/src/dmr_pi.c
-@@ -14,6 +14,9 @@ void dmr_pi (dsd_opts * opts, dsd_state * state, uint8_t PI_BYTE[], uint32_t CRC
- {
-   UNUSED2(opts, CRCCorrect);
- 
-+  //force slot to 0 if using dmr mono handling
-+  if (opts->dmr_mono == 1) state->currentslot = 0;
-+
-   if((IrrecoverableErrors == 0)) 
-   {
- 
-diff --git a/src/dsd_audio2.c b/src/dsd_audio2.c
-index 756e468..13316df 100644
--- a/src/dsd_audio2.c
-+++ b/src/dsd_audio2.c
-@@ -988,6 +988,9 @@ void playSynthesizedVoiceSS3 (dsd_opts * opts, dsd_state * state)
-   memset (stereo_samp2, 0, sizeof(stereo_samp2));
-   memset (stereo_samp3, 0, sizeof(stereo_samp3));
- 
-+  if (opts->dmr_mono == 1)
-+    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4));
-+
-   //dmr enc checkdown for whether or not to fill the stereo sample or not for playback or writing
-   encL = encR = 0;
-   encL = (state->dmr_so  >> 6) & 0x1;
-@@ -1070,8 +1073,16 @@ void playSynthesizedVoiceSS3 (dsd_opts * opts, dsd_state * state)
-   }
- 
-   //flag either left or right as 'enc' to mute if B
-  if (strcmp(modeL, "B") == 0) encL = 1;
-  if (strcmp(modeR, "B") == 0) encR = 1;
-+  if (strcmp(modeL, "B") == 0)
-+  {
-+    encL = 1;
-+    encR = 1;
-+  }
-+  if (strcmp(modeR, "B") == 0)
-+  {
-+    encR = 1;
-+    encL = 1;
-+  }
- 
-   //check to see if we need to enable slot and toggle slot preference here
-   //this method will always favor slot 2 (this is a patch anyways, so....meh)
-diff --git a/src/dsd_frame.c b/src/dsd_frame.c
-index 577169c..275abb6 100644
--- a/src/dsd_frame.c
-+++ b/src/dsd_frame.c
-@@ -160,7 +160,8 @@ processFrame (dsd_opts * opts, dsd_state * state)
-           sprintf (state->slot2light, " slot2 ");
-           //we can safely open MBE on any MS or mono handling
-           if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL)) openMbeOutFile (opts, state); 
-          if (opts->p25_trunk == 0) dmrMSBootstrap (opts, state); 
-+          // if (opts->p25_trunk == 0) //line disabled to allow mono mode while trunking
-+            dmrMSBootstrap (opts, state); 
-         }
-         if (opts->dmr_mono == 1 && state->synctype == 32)
-         {
-diff --git a/src/dsd_main.c b/src/dsd_main.c
-index 3ca7788..22462a0 100644
--- a/src/dsd_main.c
-+++ b/src/dsd_main.c
-@@ -1645,9 +1645,9 @@ main (int argc, char **argv)
-   }
- 
-   #ifdef AERO_BUILD
-  fprintf (stderr, "Build Version: AW (20231015) \n");
-+  fprintf (stderr, "Build Version: AW MTL (20240201) \n");
-   #else
-  fprintf (stderr, "Build Version: AW %s \n", GIT_TAG);
-+  fprintf (stderr, "Build Version: AW MTL %s \n", GIT_TAG);
-   #endif
-   fprintf (stderr,"MBElib Version: %s\n", versionstr);
- 
-@@ -2474,14 +2474,18 @@ main (int argc, char **argv)
-             opts.mod_qpsk = 0;
-             opts.mod_gfsk = 0;
-             state.rf_mod = 0;
-            opts.dmr_stereo = 1;
-            opts.dmr_mono = 0;
-+            // opts.dmr_stereo = 1;
-+            // opts.dmr_mono = 0;
-             // opts.setmod_bw = 7000;
-             opts.pulse_digi_rate_out = 8000;
-             opts.pulse_digi_out_channels = 2;
-            sprintf (opts.output_name, "DMR");
-            
-            fprintf (stderr,"Decoding DMR Stereo BS/MS Simplex\n");
-+            opts.dmr_mono = 1;
-+            opts.dmr_stereo = 0; //not sure if this will break anything
-+            state.dmr_stereo = 0; //0
-+            // opts.setmod_bw = 7000;
-+            sprintf (opts.output_name, "DMR Mono");
-+            // fprintf (stderr,"-fr / DMR Mono switch enabled. \n NOTE: Some ENC options in Slot 2 may not work properly.\n");
-+            fprintf (stderr,"\n Decoding DMR Stereo BS/MS Simplex in Mono Single Slot Only Configuration.\n");
-           }
-           //change ft to only do P25 and DMR (TDMA trunking modes)
-           else if (optarg[0] == 't')
-@@ -2558,13 +2562,13 @@ main (int argc, char **argv)
-             state.rf_mod = 0;  //
-             opts.pulse_digi_rate_out = 8000;
-             opts.pulse_digi_out_channels = 2;
-            opts.dmr_mono = 0;
-            opts.dmr_stereo = 1;
-+            opts.dmr_mono = 1;
-+            opts.dmr_stereo = 0; //not sure if this will break anything
-             state.dmr_stereo = 0; //0
-             // opts.setmod_bw = 7000;
-            sprintf (opts.output_name, "DMR Stereo");
-            fprintf (stderr,"-fr / DMR Mono switch has been deprecated.\n");
-            fprintf (stderr,"Decoding DMR Stereo BS/MS Simplex\n");
-+            sprintf (opts.output_name, "DMR Mono");
-+            // fprintf (stderr,"-fr / DMR Mono switch enabled. \n NOTE: Some ENC options in Slot 2 may not work properly.\n");
-+            fprintf (stderr,"\n Decoding DMR Stereo BS/MS Simplex in Mono Single Slot Only Configuration.\n");
- 
-           }
-           else if (optarg[0] == 'm')
-diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
-index 73965dc..e5b38aa 100644
--- a/src/dsd_ncurses.c
-+++ b/src/dsd_ncurses.c
-@@ -2297,8 +2297,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-   if (opts->ncurses_compact == 1)
-   {
-     printw ("------------------------------------------------------------------------------\n");
-    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW (20231015)");
-    printw ("------------------------------------------------------------------------------\n");
-+    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW MTL (20240328)");
-+    printw ("------------------------------------------------------------------------------\n"); 
-   }
- #elif LIMAZULUTWEAKS
-   if (opts->ncurses_compact == 1)
-@@ -2336,12 +2336,12 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-       #endif
-       #ifdef AERO_BUILD
-       if (i == 5) printw (" %s ", "Aero Build");
-      if (i == 6) printw (" AW (20231015) \n");
-+      if (i == 6) printw (" AW MTL (20240328) \n");
-       #elif ZDEV_BUILD
-      if (i == 5) printw (" %s ", "AW ");
-+      if (i == 5) printw (" %s ", "AW MTL");
-       if (i == 6) printw (" %s \n", GIT_TAG);
-      #else
-      if (i == 5) printw (" %s ", "AW ");
-+      #else 
-+      if (i == 5) printw (" %s ", "AW MTL");
-       if (i == 6) printw (" %s \n", GIT_TAG);
-       #endif
-       else printw ("\n");
--- a/patch/cretu_no_dmr_idle.patch
+++ b/patch/cretu_no_dmr_idle.patch
@@ -1,277 +0,0 @@
-diff --git a/include/dsd.h b/include/dsd.h
-index 9ebf3f1..c5ac68a 100644
--- a/include/dsd.h
-+++ b/include/dsd.h
-@@ -18,16 +18,16 @@
-  */
- 
- //defined by CMakeLists.txt -- Disable by using cmake -DCOLORS=OFF ..
-#ifdef PRETTY_COLORS
-#define KNRM  "\x1B[0m"
-#define KRED  "\x1B[31m"
-#define KGRN  "\x1B[32m"
-#define KYEL  "\x1B[33m"
-#define KBLU  "\x1B[34m"
-#define KMAG  "\x1B[35m"
-#define KCYN  "\x1B[36m"
-#define KWHT  "\x1B[37m"
-#else
-+// #ifdef PRETTY_COLORS
-+// #define KNRM  "\x1B[0m"
-+// #define KRED  "\x1B[31m"
-+// #define KGRN  "\x1B[32m"
-+// #define KYEL  "\x1B[33m"
-+// #define KBLU  "\x1B[34m"
-+// #define KMAG  "\x1B[35m"
-+// #define KCYN  "\x1B[36m"
-+// #define KWHT  "\x1B[37m"
-+// #else
- #define KNRM  ""
- #define KRED  ""
- #define KGRN  ""
-@@ -36,7 +36,7 @@
- #define KMAG  ""
- #define KCYN  ""
- #define KWHT  ""
-#endif
-+// #endif
- 
- #include "config.h"
- #include <stdio.h>
-diff --git a/src/dmr_bs.c b/src/dmr_bs.c
-index bdab262..17a9e70 100644
--- a/src/dmr_bs.c
-+++ b/src/dmr_bs.c
-@@ -266,14 +266,14 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
-   if ( strcmp (sync, DMR_BS_DATA_SYNC) == 0 )
-   {
-     
-    fprintf (stderr,"%s ", timestr);
-+    // fprintf (stderr,"%s ", timestr);
-     if (internalslot == 0)
-     {
-       if (opts->inverted_dmr == 0)
-       {
-        fprintf (stderr,"Sync: +DMR  ");
-+        // fprintf (stderr,"Sync: +DMR  ");
-       }
-      else fprintf (stderr,"Sync: -DMR  ");
-+      else {}//fprintf (stderr,"Sync: -DMR  ");
-       
-       vc1 = 7; //set to 7 so we can see that we should not be on a VC unless a framesync comes in for it first
- 
-@@ -284,9 +284,9 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
-     {
-       if (opts->inverted_dmr == 0)
-       {
-        fprintf (stderr,"Sync: +DMR  ");
-+        // fprintf (stderr,"Sync: +DMR  ");
-       }
-      else fprintf (stderr,"Sync: -DMR  ");
-+      else {}//fprintf (stderr,"Sync: -DMR  ");
- 
-       vc2 = 7; //set to 7 so we can see that we should not be on a VC unless a framesync comes in for it first
- 
-diff --git a/src/dmr_data.c b/src/dmr_data.c
-index 87f4dfd..57e5647 100644
--- a/src/dmr_data.c
-+++ b/src/dmr_data.c
-@@ -232,10 +232,10 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
-     sprintf(state->slot2light, "[sLoT2]");
-   }
- 
-  if (state->dmr_ms_mode == 0)
-  {
-    fprintf(stderr, "%s %s ", state->slot1light, state->slot2light);
-  }
-+  // if (state->dmr_ms_mode == 0)
-+  // {
-+  //   fprintf(stderr, "%s %s ", state->slot1light, state->slot2light);
-+  // }
- 
-   // Slot type - Second part - Parity bit
-   for (i = 0; i < 5; i++)
-@@ -292,6 +292,13 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
-     info[(2*i) + 98] = (1 & (dibit >> 1));  // bit 1
-     info[(2*i) + 99] = (1 & dibit);         // bit 0
-   }
-+
-+  // if (state->dmr_ms_mode == 0 && burst != 0x09)
-+  if (burst != 0x09)
-+  {
-+    printFrameSync (opts, state, "+DMR ", 90, NULL); //don't think the values matter
-+    fprintf(stderr, "%s %s ", state->slot1light, state->slot2light);
-+  }
-   
-   //don't run on MS Reverse Channel Data
-   if (state->dmr_ms_rc == 0) dmr_data_burst_handler(opts, state, (uint8_t *)info, burst);
-@@ -303,15 +310,16 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
-   } 
- 
-   //ending line break
-  fprintf(stderr, "\n");
-+  if (burst != 0x09)
-+    fprintf(stderr, "\n");
- 
-   END:
-   if (SlotTypeOk == 0 || cach_okay != 1)
-   {
-    fprintf (stderr, "%s", KRED);
-    fprintf (stderr, "| CACH/Burst FEC ERR");
-    fprintf (stderr, "%s", KNRM);
-    fprintf (stderr, "\n");
-+    // fprintf (stderr, "%s", KRED);
-+    // fprintf (stderr, "| CACH/Burst FEC ERR");
-+    // fprintf (stderr, "%s", KNRM);
-+    // fprintf (stderr, "\n");
-     dmr_reset_blocks (opts, state); //failsafe to reset all data header and blocks when bad tact or slottype
-   }
- 
-diff --git a/src/dmr_dburst.c b/src/dmr_dburst.c
-index fe81158..078524d 100644
--- a/src/dmr_dburst.c
-+++ b/src/dmr_dburst.c
-@@ -205,7 +205,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
-   //flag off prop head when not looking at data blocks
-   if (databurst != 0x6 && databurst != 0x7 && databurst != 0x8 && databurst != 0xA && databurst != 0xB) state->data_p_head[slot] = 0;
- 
-  if (databurst != 0xEB)
-+  if (databurst != 0xEB && databurst != 0x09)
-   {
-     if (state->dmr_ms_mode == 0)
-     { 
-diff --git a/src/dmr_flco.c b/src/dmr_flco.c
-index 839b085..e43b568 100644
--- a/src/dmr_flco.c
-+++ b/src/dmr_flco.c
-@@ -790,21 +790,23 @@ uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25])
-     crc = crc8_ok(slco_bits, 36);
- 
-     //only run SLCO on good everything
-    if (h1 && h2 && h3 && crc) dmr_slco (opts, state, slco_bits);
-    else
-    {
-      //this line break issue is wracking on my OCD for clean line breaks
-      if (opts->payload == 1 && state->dmrburstL == 16 && state->currentslot == 0) ; //no line break if current slot is voice with payload enabled
-      else if (opts->payload == 1 && state->dmrburstR == 16 && state->currentslot == 1) ; //no line break if current slot is voice with payload enabled
-      else fprintf (stderr, "\n");
-      fprintf (stderr, "%s", KRED);
-      fprintf (stderr, " SLCO CRC ERR");
-      fprintf (stderr, "%s", KNRM);
-      if (opts->payload == 1 && state->dmrburstL == 16 && state->currentslot == 0) //if current slot is voice with payload enabled
-        fprintf (stderr, "\n");
-      else if (opts->payload == 1 && state->dmrburstR == 16 && state->currentslot == 1) //if current slot is voice with payload enabled
-        fprintf (stderr, "\n");
-    } 
-+    if (h1 && h2 && h3 && crc) {} //dmr_slco (opts, state, slco_bits);
-+    // else
-+    // {
-+    //   //this line break issue is wracking on my OCD for clean line breaks
-+    //   if (opts->payload == 1 && state->dmrburstL == 16 && state->currentslot == 0) {} //no line break if current slot is voice with payload enabled
-+    //   else if (opts->payload == 1 && state->dmrburstR == 16 && state->currentslot == 1) {} //no line break if current slot is voice with payload enabled
-+    //   else {} //fprintf (stderr, "\n");
-+    //   // fprintf (stderr, "%s", KRED);
-+    //   // fprintf (stderr, " SLCO CRC ERR");
-+    //   // fprintf (stderr, "%s", KNRM);
-+    //   if (opts->payload == 1 && state->dmrburstL == 16 && state->currentslot == 0) //if current slot is voice with payload enabled
-+    //     fprintf (stderr, "\n");
-+    //   else if (opts->payload == 1 && state->dmrburstR == 16 && state->currentslot == 1) //if current slot is voice with payload enabled
-+    //     fprintf (stderr, "\n");
-+    // } 
-+
-+    UNUSED(opts);
-     
-   }
-   return (err); //return err value based on success or failure, even if we aren't checking it
-@@ -935,8 +937,11 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
-   uint8_t xpt_hash = (uint8_t)ConvertBitIntoBytes(&slco_bits[20], 8); //priority TG hash
- 
-   //initial line break
-  fprintf (stderr, "\n");
-  fprintf (stderr, "%s", KYEL);
-+  if (slco != 0)
-+  {
-+    fprintf (stderr, "\n");
-+    fprintf (stderr, "%s", KYEL);
-+  }
- 
-   if (slco == 0x2) //C_SYS_Parms
-   {
-@@ -973,7 +978,8 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
-     else sprintf (state->dmr_site_parms, "TIII %s:%d-%d;%04X; ", model_str, net, site, syscode);
-   }
-   else if (slco == 0x0) //null
-    fprintf (stderr, " SLCO NULL ");
-+    // fprintf (stderr, " SLCO NULL ");
-+    {}
-   else if (slco == 0x1)
-   {
-     fprintf (stderr, " Activity Update"); //102 361-2 7.1.3.2
-diff --git a/src/dsd_frame_sync.c b/src/dsd_frame_sync.c
-index 062bb20..f47a447 100644
--- a/src/dsd_frame_sync.c
-+++ b/src/dsd_frame_sync.c
-@@ -940,7 +940,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
-                 sprintf(state->ftype, "DMR ");
-                 if (opts->errorbars == 1)
-                 {
-                  printFrameSync (opts, state, "+DMR ", synctest_pos + 1, modulation);
-+                  // printFrameSync (opts, state, "+DMR ", synctest_pos + 1, modulation);
-                 }
-                 state->lastsynctype = 10;
-                 state->last_cc_sync_time = time(NULL); 
-@@ -1068,7 +1068,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
-                 sprintf(state->ftype, "DMR ");
-                 if (opts->errorbars == 1) //&& opts->dmr_stereo == 0
-                 {
-                  printFrameSync (opts, state, "-DMR ", synctest_pos + 1, modulation);
-+                  // printFrameSync (opts, state, "-DMR ", synctest_pos + 1, modulation);
-                 }
-                 state->lastsynctype = 13;
-                 state->last_cc_sync_time = time(NULL); 
-@@ -1443,7 +1443,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
-             {
-               if ((opts->errorbars == 1) && (opts->verbose > 1) && (state->carrier == 1))
-                 {
-                  fprintf (stderr,"Sync: no sync\n");
-+                  // fprintf (stderr,"Sync: no sync\n");
-                   // fprintf (stderr,"Press CTRL + C to close.\n"); 
- 
-                 }
-diff --git a/src/dsd_main.c b/src/dsd_main.c
-index 98f2ead..b09cb81 100644
--- a/src/dsd_main.c
-+++ b/src/dsd_main.c
-@@ -1687,7 +1687,7 @@ main (int argc, char **argv)
-   }
- 
-   #ifdef AERO_BUILD
-  fprintf (stderr, "Build Version: AW (20231015) \n");
-+  fprintf (stderr, "Build Version: AW (20240523) \n");
-   #else
-   fprintf (stderr, "Build Version: AW %s \n", GIT_TAG);
-   #endif
-diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
-index a5442af..514b9ae 100644
--- a/src/dsd_ncurses.c
-+++ b/src/dsd_ncurses.c
-@@ -2423,7 +2423,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-   if (opts->ncurses_compact == 1)
-   {
-     printw ("------------------------------------------------------------------------------\n");
-    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW (20231015)");
-+    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW (20240523)");
-     printw ("------------------------------------------------------------------------------\n");
-   }
- #elif LIMAZULUTWEAKS
-@@ -2462,8 +2462,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-       if (i == 4 && opts->frame_m17 == 1) printw (" CODEC2");
-       #endif
-       #ifdef AERO_BUILD
-      if (i == 5) printw (" %s ", "Aero Build");
-      if (i == 6) printw (" AW (20231015) \n");
-+      if (i == 5) printw (" %s ", "Cretu Build");
-+      if (i == 6) printw (" AW (20240523) \n");
-       #elif ZDEV_BUILD
-       if (i == 5) printw (" %s ", "AW ");
-       if (i == 6) printw (" %s \n", GIT_TAG);
--- a/patch/dmr_data_voice_call_tg_src_persistency_ncurses2.patch
+++ b/patch/dmr_data_voice_call_tg_src_persistency_ncurses2.patch
@@ -1,120 +0,0 @@
-diff --git a/src/dmr_block.c b/src/dmr_block.c
-index 893b0e8..e7f9de7 100644
--- a/src/dmr_block.c
-+++ b/src/dmr_block.c
-@@ -783,6 +783,6 @@ void dmr_reset_blocks (dsd_opts * opts, dsd_state * state)
-   //reset some strings -- resetting call string here causes random blink on ncurses terminal (cap+)
-   // sprintf (state->call_string[0], "%s", "                     "); //21 spaces
-   // sprintf (state->call_string[1], "%s", "                     "); //21 spaces
-  sprintf (state->dmr_lrrp_gps[0], "%s", "");
-  sprintf (state->dmr_lrrp_gps[1], "%s", "");
-+  // sprintf (state->dmr_lrrp_gps[0], "%s", ""); //disabled for dmr data call persistence #174
-+  // sprintf (state->dmr_lrrp_gps[1], "%s", ""); //disabled for dmr data call persistence #174
- }
-\ No newline at end of file
-diff --git a/src/dmr_data.c b/src/dmr_data.c
-index 3541152..3cae906 100644
--- a/src/dmr_data.c
-+++ b/src/dmr_data.c
-@@ -267,7 +267,20 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
-   state->color_code_ok = SlotTypeOk;
- 
-   //not sure why I still have two variables for this, need to look and see what state->color_code still ties into
-  if (SlotTypeOk == 1) state->dmr_color_code = state->color_code;
-+  if (SlotTypeOk == 1) 
-+  {
-+    if (state->dmr_color_code != state->color_code)
-+    {
-+      //Zero out values on color code change #174
-+      state->lasttg = 0;
-+      state->lasttgR =0;
-+      state->lastsrc = 0;
-+      state->lastsrcR = 0;
-+      sprintf (state->dmr_lrrp_gps[0], "%s", "");
-+      sprintf (state->dmr_lrrp_gps[1], "%s", "");
-+      state->dmr_color_code = state->color_code;
-+    }
-+  }
- 
-   /* Reconstitute the burst type */
-   burst = (uint8_t)((SlotType[4] << 3) + (SlotType[5] << 2) + (SlotType[6] << 1) + SlotType[7]);
-diff --git a/src/dsd_main.c b/src/dsd_main.c
-index 5531ef3..5598793 100644
--- a/src/dsd_main.c
-+++ b/src/dsd_main.c
-@@ -257,10 +257,10 @@ if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5
-   //zero out right away if not trunking
-   if (opts->p25_trunk == 0)
-   {
-    state->lasttg = 0;
-    state->lastsrc = 0;
-    state->lasttgR = 0;
-    state->lastsrcR = 0;
-+    // state->lasttg = 0; //disabled for dmr voice call persistence #174
-+    // state->lastsrc = 0; //disabled for dmr voice call persistence #174
-+    // state->lasttgR = 0; //disabled for dmr voice call persistence #174
-+    // state->lastsrcR = 0; //disabled for dmr voice call persistence #174
- 
-     //zero out vc frequencies?
-     state->p25_vc_freq[0] = 0;
-@@ -290,10 +290,10 @@ if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5
-   //mainly bugfix for ncurses and per call wavs (edacs) and also signal fade, etc
-   if (opts->p25_trunk == 1 && opts->p25_is_tuned == 1 && time(NULL) - state->last_cc_sync_time > opts->trunk_hangtime) 
-   {
-    state->lasttg = 0;
-    state->lastsrc = 0;
-    state->lasttgR = 0;
-    state->lastsrcR = 0;
-+    // state->lasttg = 0; //disabled for dmr voice call persistence #174
-+    // state->lastsrc = 0; //disabled for dmr voice call persistence #174
-+    // state->lasttgR = 0; //disabled for dmr voice call persistence #174
-+    // state->lastsrcR = 0; //disabled for dmr voice call persistence #174
- 
-   }
-     
-@@ -431,7 +431,7 @@ if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5
-   memset(state->dmr_alias_len, 0, sizeof(state->dmr_alias_len));
-   memset(state->dmr_alias_block_segment, 0, sizeof(state->dmr_alias_block_segment));
-   memset(state->dmr_embedded_gps, 0, sizeof(state->dmr_embedded_gps));
-  memset(state->dmr_lrrp_gps, 0, sizeof(state->dmr_lrrp_gps));
-+  // memset(state->dmr_lrrp_gps, 0, sizeof(state->dmr_lrrp_gps));
- 
-   // memset(state->active_channel, 0, sizeof(state->active_channel));
- 
-diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
-index 4646e77..e9ecab1 100644
--- a/src/dsd_ncurses.c
-+++ b/src/dsd_ncurses.c
-@@ -3104,7 +3104,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-     }
- 
-     //LRRP
-    if(state->dmrburstL != 16) //only during data and no trunking
-+    // if(state->dmrburstL != 16) //only during data and no trunking //disabled for dmr data call persistence #174
-     {
-       attron(COLOR_PAIR(4));
-       printw  ("%s", state->dmr_lrrp_gps[0]);
-@@ -3298,7 +3298,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-       }
- 
-       //LRRP
-      if(state->dmrburstR != 16) //only during data and no trunking
-+      // if(state->dmrburstR != 16) //only during data and no trunking //disabled for dmr data call persistence #174
-       {
-         attron(COLOR_PAIR(4));
-         printw  ("%s", state->dmr_lrrp_gps[1]);
-@@ -3978,10 +3978,10 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-     dmr_reset_blocks (opts, state);
- 
-     //zero out additional items
-    state->lasttg = 0;
-    state->lasttgR = 0;
-    state->lastsrc = 0;
-    state->lastsrcR = 0;
-+    // state->lasttg = 0; //disabled for dmr voice call persistence #174
-+    // state->lasttgR = 0; //disabled for dmr voice call persistence #174
-+    // state->lastsrc = 0; //disabled for dmr voice call persistence #174
-+    // state->lastsrcR = 0; //disabled for dmr voice call persistence #174
-     state->payload_algid = 0;
-     state->payload_algidR = 0;
-     state->payload_keyid = 0;
--- a/patch/g_dmr_per_call_wav_file_fixes_w_custom_wav_dir_20240601b.patch
+++ b/patch/g_dmr_per_call_wav_file_fixes_w_custom_wav_dir_20240601b.patch
@@ -1,499 +0,0 @@
-diff --git a/src/dmr_csbk.c b/src/dmr_csbk.c
-index 6ee44d6..45502a4 100644
--- a/src/dmr_csbk.c
-+++ b/src/dmr_csbk.c
-@@ -520,6 +520,26 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
-               //rigctl
-               if (opts->use_rigctl == 1)
-               {
-+                
-+                if (state->currentslot == 0)
-+                {
-+                  //close any perCall wav files that are open
-+                  if (opts->dmr_stereo_wav == 1 && opts->wav_out_f != NULL)
-+                  {
-+                    closeWavOutFileL (opts, state);
-+                    opts->wav_out_f = NULL;
-+                  }
-+                }
-+                else if (state->currentslot == 1)
-+                {
-+                  //close any perCall wav files that are open
-+                  if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR != NULL)
-+                  {
-+                    closeWavOutFileR (opts, state);
-+                    opts->wav_out_fR = NULL;
-+                  }
-+                }
-+
-                 //Guess I forgot to add this condition here
-                 if (GetCurrentFreq(opts->rigctl_sockfd) != state->p25_cc_freq)
-                   dmr_reset_blocks (opts, state); //reset all block gathering since we are tuning away from current frequency
-@@ -554,6 +574,26 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
-               else if (opts->audio_in_type == 3)
-               {
-                 #ifdef USE_RTLSDR
-+                
-+                if (state->currentslot == 0)
-+                {
-+                  //close any perCall wav files that are open
-+                  if (opts->dmr_stereo_wav == 1 && opts->wav_out_f != NULL)
-+                  {
-+                    closeWavOutFileL (opts, state);
-+                    opts->wav_out_f = NULL;
-+                  }
-+                }
-+                else if (state->currentslot == 1)
-+                {
-+                  //close any perCall wav files that are open
-+                  if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR != NULL)
-+                  {
-+                    closeWavOutFileR (opts, state);
-+                    opts->wav_out_fR = NULL;
-+                  }
-+                }
-+
-                 //Guess I forgot to add this condition here
-                 uint32_t tempf = (uint32_t)state->p25_cc_freq;
-                 if (opts->rtlsdr_center_freq != tempf)
-diff --git a/src/dmr_flco.c b/src/dmr_flco.c
-index 839b085..637debf 100644
--- a/src/dmr_flco.c
-+++ b/src/dmr_flco.c
-@@ -298,20 +298,7 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
- 
-     if (type != 2) //VLC and EMB, set our target, source, so, and fid per channel
-     {
-      if (state->currentslot == 0)
-      {
-        state->dmr_fid = fid;
-        state->dmr_so = so;
-        state->lasttg = target;
-        state->lastsrc = source;
-      }
-      if (state->currentslot == 1)
-      {
-        state->dmr_fidR = fid;
-        state->dmr_soR = so;
-        state->lasttgR = target;
-        state->lastsrcR = source;
-      }
-+      //moved per call further down past the call_string stuff
- 
-       //update cc amd vc sync time for trunking purposes (particularly Con+)
-       if (opts->p25_is_tuned == 1)
-@@ -337,6 +324,12 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
-         //reset gain
-         if (opts->floating_point == 1)
-           state->aout_gain = opts->audio_gain;
-+        //close any perCall wav files that are open
-+        if (opts->dmr_stereo_wav == 1 && opts->wav_out_f != NULL)
-+        {
-+          closeWavOutFileL (opts, state);
-+          opts->wav_out_f = NULL;
-+        }
-       }
-       if (state->currentslot == 1)
-       {
-@@ -350,6 +343,12 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
-         //reset gain
-         if (opts->floating_point == 1)
-           state->aout_gainR = opts->audio_gain; 
-+        //close any perCall wav files that are open
-+        if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR != NULL)
-+        {
-+          closeWavOutFileR (opts, state);
-+          opts->wav_out_fR = NULL;
-+        }
-       }
-       
-     }
-@@ -612,6 +611,69 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
-       fprintf (stderr, "Key %010llX ", state->RR);
-       fprintf (stderr, "%s ", KNRM);
-     }
-+
-+    if (type != 2)
-+    {
-+      if (state->currentslot == 0)
-+      {
-+        state->dmr_fid = fid;
-+        state->dmr_so = so;
-+        state->lasttg = target;
-+        state->lastsrc = source;
-+        char * timestr = NULL;
-+        char * datestr = NULL;
-+        timestr = getTime();
-+        datestr = getDate();
-+
-+        //setup a call string for the per call (group/private and/or emergency)
-+        char cs[200]; memset (cs, 0, 200*sizeof(char));
-+        int x = 0;
-+        for (int i = 0; i < 200; i++)
-+        {
-+          //copy over non space and non termination values from call string
-+          if (i != 0 && state->call_string[0][i] != ' ' && state->call_string[0][i] != 0)
-+            cs[x++] = state->call_string[0][i];
-+        }
-+        cs[x] = 0; //terminate
-+
-+        //open wav file here if not already opened
-+        if (opts->dmr_stereo_wav == 1 && opts->wav_out_f == NULL)
-+        {
-+          sprintf (opts->wav_out_file, "%s/%s %s CC %d - %s - TG %d - RD %d", opts->wav_out_dir, datestr, timestr, state->dmr_color_code, cs, target, source);
-+          openWavOutFileL (opts, state);
-+        }
-+        free (timestr); free(datestr);
-+      }
-+      if (state->currentslot == 1)
-+      {
-+        state->dmr_fidR = fid;
-+        state->dmr_soR = so;
-+        state->lasttgR = target;
-+        state->lastsrcR = source;
-+        char * timestr = NULL;
-+        char * datestr = NULL;
-+        timestr = getTime();
-+        datestr = getDate();
-+
-+        //setup a call string for the per call (group/private and/or emergency)
-+        char cs[200]; memset (cs, 0, 200*sizeof(char));
-+        int x = 0;
-+        for (int i = 0; i < 200; i++)
-+        {
-+          //copy over non space and non termination values from call string
-+          if (i != 0 && state->call_string[1][i] != ' ' && state->call_string[1][i] != 0)
-+            cs[x++] = state->call_string[1][i];
-+        }
-+        cs[x] = 0; //terminate
-+
-+        //open wav file here if not already opened
-+        if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR == NULL)
-+        {
-+          sprintf (opts->wav_out_fileR, "%s/%s %s CC %d - %s - TG %d - RD %d", opts->wav_out_dir, datestr, timestr, state->dmr_color_code, cs, target, source);
-+          openWavOutFileR (opts, state);
-+        }
-+      }
-+    }
-     
-   }
- 
-diff --git a/src/dsd_file.c b/src/dsd_file.c
-index 6f4ecaa..f4b201d 100644
--- a/src/dsd_file.c
-+++ b/src/dsd_file.c
-@@ -555,6 +555,16 @@ void closeWavOutFile (dsd_opts * opts, dsd_state * state)
-   UNUSED(state);
- 
-   sf_close(opts->wav_out_f);
-+  char newfilename[1032];
-+  int result; UNUSED(result);
-+  sprintf (newfilename, "%s.wav", opts->wav_out_file);
-+  result = rename (opts->wav_out_file, newfilename);
-+  // fprintf (stderr, "\n Close WAV FileF %s; Result: %d \n", newfilename, result);
-+
-+  //copy back to wav_out_file string for ncurses display
-+  memcpy (opts->wav_out_file, newfilename, 1023);
-+  opts->wav_out_file[1023] = 0;
-+
- }
- 
- void closeWavOutFileL (dsd_opts * opts, dsd_state * state)
-@@ -562,6 +572,16 @@ void closeWavOutFileL (dsd_opts * opts, dsd_state * state)
-   UNUSED(state);
- 
-   sf_close(opts->wav_out_f);
-+  char newfilename[1032];
-+  int result; UNUSED(result);
-+  sprintf (newfilename, "%s.wav", opts->wav_out_file);
-+  result = rename (opts->wav_out_file, newfilename);
-+  // fprintf (stderr, "\n Close WAV FileL %s; Result: %d \n", newfilename, result);
-+
-+  //copy back to wav_out_file string for ncurses display
-+  memcpy (opts->wav_out_file, newfilename, 1023);
-+  opts->wav_out_file[1023] = 0;
-+
- }
- 
- void closeWavOutFileR (dsd_opts * opts, dsd_state * state)
-@@ -569,6 +589,15 @@ void closeWavOutFileR (dsd_opts * opts, dsd_state * state)
-   UNUSED(state);
- 
-   sf_close(opts->wav_out_fR);
-+  char newfilename[1032];
-+  int result; UNUSED(result);
-+  sprintf (newfilename, "%s.wav", opts->wav_out_fileR);
-+  result = rename (opts->wav_out_fileR, newfilename);
-+  // fprintf (stderr, "\n Close WAV FileR %s; Result: %d \n", newfilename, result);
-+
-+  //copy back to wav_out_file string for ncurses display
-+  memcpy (opts->wav_out_fileR, newfilename, 1023);
-+  opts->wav_out_fileR[1023] = 0;
- }
- 
- void closeWavOutFileRaw (dsd_opts * opts, dsd_state * state)
-diff --git a/src/dsd_main.c b/src/dsd_main.c
-index 3fb0893..a6d45e5 100644
--- a/src/dsd_main.c
-+++ b/src/dsd_main.c
-@@ -107,6 +107,32 @@ void
- noCarrier (dsd_opts * opts, dsd_state * state)
- {
- 
-+  //close any perCall wav files that are open
-+  if (opts->dmr_stereo_wav == 1 && opts->wav_out_f != NULL)
-+  {
-+    closeWavOutFileL (opts, state);
-+    opts->wav_out_f = NULL;
-+  }
-+  if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR != NULL)
-+  {
-+    closeWavOutFileR (opts, state);
-+    opts->wav_out_fR = NULL;
-+  }
-+  //end perCall wav file close
-+
-+  //close any perCall wav files that are open
-+  if (opts->dmr_stereo_wav == 1 && opts->wav_out_f != NULL)
-+  {
-+    closeWavOutFileL (opts, state);
-+    opts->wav_out_f = NULL;
-+  }
-+  if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR != NULL)
-+  {
-+    closeWavOutFileR (opts, state);
-+    opts->wav_out_fR = NULL;
-+  }
-+  //end perCall wav file close
-+
- // #ifdef AERO_BUILD //NOTE: Blame seems to be synctest8 not being initialized (will continue to test)
- // //TODO: Investigate why getSymbol needs to be run first in this context...truly confused here
- // if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5
-@@ -1692,9 +1718,9 @@ main (int argc, char **argv)
-   }
- 
-   #ifdef AERO_BUILD
-  fprintf (stderr, "Build Version: AW (20231015) \n");
-+  fprintf (stderr, "Build Version: AW (20240601) G Build\n");
-   #else
-  fprintf (stderr, "Build Version: AW %s \n", GIT_TAG);
-+  fprintf (stderr, "Build Version: AW %s G Build\n", GIT_TAG);
-   #endif
-   fprintf (stderr,"MBElib Version: %s\n", versionstr);
- 
-diff --git a/src/dsd_mbe.c b/src/dsd_mbe.c
-index fe71539..2702b5d 100644
--- a/src/dsd_mbe.c
-+++ b/src/dsd_mbe.c
-@@ -1197,7 +1197,8 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
-     if (state->dmr_encL == 0 || opts->dmr_mute_encL == 0)
-     {
-       //write wav to per call on left channel Slot 1
-      writeSynthesizedVoice (opts, state);
-+      if (opts->wav_out_f != NULL)
-+        writeSynthesizedVoice (opts, state);
-     }
-   }
- 
-@@ -1207,7 +1208,8 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
-     if (state->dmr_encR == 0 || opts->dmr_mute_encR == 0)
-     {
-       //write wav to per call on right channel Slot 2
-      writeSynthesizedVoiceR (opts, state);
-+      if (opts->wav_out_fR != NULL)
-+        writeSynthesizedVoiceR (opts, state);
-     }
-   }
- 
-diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
-index a5442af..0cd538d 100644
--- a/src/dsd_ncurses.c
-+++ b/src/dsd_ncurses.c
-@@ -1071,7 +1071,7 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
-         if (choicec == 12)
-         {
-           //flesh out all closewavs and sprint "" wav filenames
-          closeWavOutFile (opts, state);
-+          // closeWavOutFile (opts, state);
-           closeWavOutFileL (opts, state);
-           closeWavOutFileR (opts, state);
-           //closeWavOutFileRaw (opts, state);
-@@ -2153,7 +2153,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-       char cs[200]; memcpy (cs, state->call_string[0], 200*sizeof(char));
- 
-       //close old first, assign name based on time and radio, open wav file
-      closeWavOutFileL (opts, state);
-+      if (opts->wav_out_f != NULL)
-+        closeWavOutFileL (opts, state);
- 
-       // sprintf (opts->wav_out_file, "%s/%s %s NXDN - RAN %d - DST %d - SRC %d.wav", opts->wav_out_dir, datestr, timestr, rn, tgn, src); //original
-       sprintf (opts->wav_out_file, "%s/%s %s NXDN - RAN %d - %s - DST %d - SRC %d.wav", opts->wav_out_dir, datestr, timestr, rn, cs, tgn, src); //with call string
-@@ -2198,27 +2199,14 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-     call_matrix[9][5] = time(NULL);
- 
-     //open wav file if enabled and both rd and tg are not 0
-    if (opts->dmr_stereo_wav == 1 && rd != 0 && tg != 0)
-    {
-      //setup a call string for the per call (group/private and/or emergency)
-      char cs[200]; memset (cs, 0, 200*sizeof(char));
-      int x = 0;
-      for (int i = 0; i < 200; i++)
-      {
-        //copy over non space and non termination values from call string
-        if (i != 0 && state->call_string[0][i] != ' ' && state->call_string[0][i] != 0)
-          cs[x++] = state->call_string[0][i];
-      }
-      cs[x] = 0; //terminate
-
-      //close old first, assign name based on time and radio, open wav file
-      closeWavOutFileL (opts, state);
-
-      // sprintf (opts->wav_out_file, "%s/%s %s MS - CC %d - TG %d - RD %d.wav",  opts->wav_out_dir, datestr, timestr, dcc, tg, rd); //original
-      sprintf (opts->wav_out_file, "%s/%s %s MS - CC %d - %s - DST %d - SRC %d.wav",  opts->wav_out_dir, datestr, timestr, dcc, cs, tg, rd); //with cs call string
-
-      openWavOutFileL (opts, state); //testing for now, will want to move to per call later
-    }
-+    // if (opts->dmr_stereo_wav == 1 && rd != 0 && tg != 0)
-+    // {
-+    //   //close old first, assign name based on time and radio, open wav file
-+    //   if (opts->wav_out_f != NULL)
-+    //     closeWavOutFileL (opts, state);
-+    //   sprintf (opts->wav_out_file, "./%s/%s %s MS - CC %d - TG %d - RD %d.wav",  opts->wav_out_dir, getDateN(), timestr, dcc, tg, rd);
-+    //   openWavOutFileL (opts, state); //testing for now, will want to move to per call later
-+    // }
- 
-     if (opts->call_alert == 1 && rd != 0 && tg != 0)
-     {
-@@ -2233,7 +2221,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-   }
- 
-   //DMR BS Slot 1 - matrix 0-4
-  if ( call_matrix[4][2] != rd && (lls == 11 || lls == 12 || lls == 10 || lls == 13 || lls == 35 || lls == 36) )
-+  if ( call_matrix[4][2] != rd && (lls == 11 || lls == 12 || lls == 10 || lls == 13 ) ) //|| lls == 35 || lls == 36
-   {
- 
-     for (short int k = 0; k < 4; k++)
-@@ -2254,27 +2242,14 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-     call_matrix[4][5] = time(NULL);
- 
-     //open wav file if enabled and both rd and tg are not 0
-    if (opts->dmr_stereo_wav == 1 && rd != 0 && tg != 0)
-    {
-      //setup a call string for the per call (group/private and/or emergency)
-      char cs[200]; memset (cs, 0, 200*sizeof(char));
-      int x = 0;
-      for (int i = 0; i < 200; i++)
-      {
-        //copy over non space and non termination values from call string
-        if (i != 0 && state->call_string[0][i] != ' ' && state->call_string[0][i] != 0)
-          cs[x++] = state->call_string[0][i];
-      }
-      cs[x] = 0; //terminate
-
-      //close old first, assign name based on time and radio, open wav file
-      closeWavOutFileL (opts, state);
-
-      // sprintf (opts->wav_out_file, "%s/%s %s CC %d - TG %d - RD %d.wav",  opts->wav_out_dir, datestr, timestr, dcc, tg, rd); //original
-      sprintf (opts->wav_out_file, "%s/%s %s CC %d - %s - DST %d - SRC %d.wav",  opts->wav_out_dir, datestr, timestr, dcc, cs, tg, rd); //with call string
-
-      openWavOutFileL (opts, state); //testing for now, will want to move to per call later
-    }
-+    // if (opts->dmr_stereo_wav == 1 && rd != 0 && tg != 0)
-+    // {
-+    //   //close old first, assign name based on time and radio, open wav file
-+    //   if (opts->wav_out_f != NULL)
-+    //     closeWavOutFileL (opts, state);
-+    //   sprintf (opts->wav_out_file, "./%s/%s %s CC %d - TG %d - RD %d",  opts->wav_out_dir, getDateN(), timestr, dcc, tg, rd);
-+    //   openWavOutFileL (opts, state); //testing for now, will want to move to per call later
-+    // }
- 
-     if (opts->call_alert == 1 && rd != 0 && tg != 0)
-     {
-@@ -2310,34 +2285,21 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-     call_matrix[9][5] = time(NULL);
- 
-     //open wav file if enabled and both rdR and tgR are not 0
-    if (opts->dmr_stereo_wav == 1 && rdR != 0 && tgR != 0)
-    {
-      //setup a call string for the per call (group/private and/or emergency)
-      char cs[200]; memset (cs, 0, 200*sizeof(char));
-      int x = 0;
-      for (int i = 0; i < 200; i++)
-      {
-        //copy over non space and non termination values from call string
-        if (i != 0 && state->call_string[1][i] != ' ' && state->call_string[1][i] != 0)
-          cs[x++] = state->call_string[1][i];
-      }
-      cs[x] = 0; //terminate
-
-      //close old first, assign name based on time and radio, open wav file
-      closeWavOutFileR (opts, state);
-
-      // sprintf (opts->wav_out_fileR, "%s/%s %s CC %d - TG %d - RD %d.wav",  opts->wav_out_dir, datestr, timestr, dcc, tgR, rdR); //original
-      sprintf (opts->wav_out_fileR, "%s/%s %s CC %d - %s - DST %d - SRC %d.wav",  opts->wav_out_dir, datestr, timestr, dcc, cs, tgR, rdR); //with call string
-
-      openWavOutFileR (opts, state); //testing for now, will want to move to per call later
-    }
-+    // if (opts->dmr_stereo_wav == 1 && rdR != 0 && tgR != 0)
-+    // {
-+    //   //close old first, assign name based on time and radio, open wav file
-+    //   if (opts->wav_out_fR != NULL)
-+    //     closeWavOutFileR (opts, state);
-+    //   sprintf (opts->wav_out_fileR, "./%s/%s %s CC %d - TG %d - RD %d",  opts->wav_out_dir, getDateN(), timestr, dcc, tgR, rdR);
-+    //   openWavOutFileR (opts, state); //testing for now, will want to move to per call later
-+    // }
- 
-    if (opts->call_alert == 1 && rdR != 0 && tgR != 0)
-    {
-      //fprintf (stderr, "BEEP 1 BS RIGHT\n");
-      beeper (opts, state, 1);
-      state->dmr_end_alert[1] = 0; //new voice frame, okay to beep at the end of it
-    }
-+    // if (opts->call_alert == 1 && rdR != 0 && tgR != 0)
-+    // {
-+    //   //fprintf (stderr, "BEEP 1 BS RIGHT\n");
-+    //   beeper (opts, state, 1);
-+    //   state->dmr_end_alert[1] = 0; //new voice frame, okay to beep at the end of it
-+    // }
- 
-     memset(state->dmr_alias_block_segment[1], 0, sizeof(state->dmr_alias_block_segment[1]));
-     sprintf (state->dmr_embedded_gps[1], "%s", "");
-@@ -2423,8 +2385,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-   if (opts->ncurses_compact == 1)
-   {
-     printw ("------------------------------------------------------------------------------\n");
-    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW (20231015)");
-    printw ("------------------------------------------------------------------------------\n");
-+    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW (20240601)");
-+    printw ("------------------------------------------------------------------------------\n"); 
-   }
- #elif LIMAZULUTWEAKS
-   if (opts->ncurses_compact == 1)
-@@ -2462,13 +2424,13 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-       if (i == 4 && opts->frame_m17 == 1) printw (" CODEC2");
-       #endif
-       #ifdef AERO_BUILD
-      if (i == 5) printw (" %s ", "Aero Build");
-      if (i == 6) printw (" AW (20231015) \n");
-+      if (i == 5) printw (" %s ", "G Build");
-+      if (i == 6) printw (" AW (20240601) \n");
-       #elif ZDEV_BUILD
-      if (i == 5) printw (" %s ", "AW ");
-+      if (i == 5) printw (" %s ", "AW G Build");
-       if (i == 6) printw (" %s \n", GIT_TAG);
-      #else
-      if (i == 5) printw (" %s ", "AW ");
-+      #else 
-+      if (i == 5) printw (" %s ", "AW G Build");
-       if (i == 6) printw (" %s \n", GIT_TAG);
-       #endif
-       else printw ("\n");
-@@ -4426,7 +4388,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-   if (c == 112) //'p' key - stop all per call wav files
-   {
-     //hope this one doesn't cause random crashing or garbage writing
-    closeWavOutFile (opts, state);
-+    // closeWavOutFile (opts, state);
-     closeWavOutFileL (opts, state);
-     closeWavOutFileR (opts, state);
-     sprintf (opts->wav_out_file, "%s", "");
--- a/src/1.c
+++ b/src/1.c
@@ -1,7 +0,0 @@
-/*-------------------------------------------------------------------------------
- * 1.c
- * Placeholder File 1 -- This file is for temporary code storage
- *
- * 
- * 
- *-----------------------------------------------------------------------------*/
--- a/src/2.c
+++ b/src/2.c
@@ -1,7 +0,0 @@
-/*-------------------------------------------------------------------------------
- * 2.c
- * Placeholder File 2 -- This file is for temporary code storage
- *
- * 
- * 
- *-----------------------------------------------------------------------------*/
--- a/src/4.c
+++ b/src/4.c
@@ -1,7 +0,0 @@
-/*-------------------------------------------------------------------------------
- * 4.c
- * Placeholder File 4 -- This file is for temporary code storage
- *
- * 
- * 
- *-----------------------------------------------------------------------------*/
--- a/src/5.c
+++ b/src/5.c
@@ -1,7 +0,0 @@
-/*-------------------------------------------------------------------------------
- * 5.c
- * Placeholder File 5 -- This file is for temporary code storage
- *
- * 
- * 
- *-----------------------------------------------------------------------------*/
--- a/src/crypt-aes.c
+++ b/src/crypt-aes.c
@@ -0,0 +1,922 @@
+/*-------------------------------------------------------------------------------
+ * aes.c         Tinier AES
+ * Easy To Use (and configurable) AES Output and Utility Bit/Byte Functions
+ *
+ * Modified Tiny AES code for more variable nk/nr/nb values, all in one file
+ * https://github.com/kokke/tiny-AES-c
+ *-----------------------------------------------------------------------------*/
+
+
+/*
+  This is free and unencumbered software released into the public domain.
+
+  Anyone is free to copy, modify, publish, use, compile, sell, or
+  distribute this software, either in source code form or as a compiled
+  binary, for any purpose, commercial or non-commercial, and by any
+  means.
+
+  In jurisdictions that recognize copyright laws, the author or authors
+  of this software dedicate any and all copyright interest in the
+  software to the public domain. We make this dedication for the benefit
+  of the public at large and to the detriment of our heirs and
+  successors. We intend this dedication to be an overt act of
+  relinquishment in perpetuity of all present and future rights to this
+  software under copyright law.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  OTHER DEALINGS IN THE SOFTWARE.
+
+  For more information, please refer to <http://unlicense.org/>
+
+*/
+
+#include <string.h>
+#include <stdint.h>
+#include <stddef.h>
+#include "dsd.h"
+
+#define AES_BLOCKLEN 16
+unsigned Nb = 4;
+unsigned Nk = 8;
+unsigned Nr = 14;
+
+struct AES_ctx
+{
+  uint8_t RoundKey[240];
+  uint8_t Iv[16];
+};
+
+//internal function prototypes
+void AES_init_ctx(struct AES_ctx* ctx, const uint8_t* key);
+void AES_init_ctx_iv(struct AES_ctx* ctx, const uint8_t* key, const uint8_t* iv);
+void AES_ctx_set_iv(struct AES_ctx* ctx, const uint8_t* iv);
+void AES_ECB_encrypt(const struct AES_ctx* ctx, uint8_t* buf);
+void AES_ECB_decrypt(const struct AES_ctx* ctx, uint8_t* buf);
+void AES_CBC_encrypt_buffer(struct AES_ctx* ctx, uint8_t* buf, size_t length);
+void AES_CBC_decrypt_buffer(struct AES_ctx* ctx, uint8_t* buf, size_t length);
+void AES_CTR_xcrypt_buffer(struct AES_ctx* ctx, uint8_t* buf, size_t length);
+
+typedef uint8_t state_t[4][4];
+
+static const uint8_t sbox[256] = {
+  //0     1    2      3     4    5     6     7      8    9     A      B    C     D     E     F
+  0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
+  0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
+  0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+  0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
+  0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
+  0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+  0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
+  0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
+  0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+  0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
+  0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
+  0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+  0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
+  0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
+  0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+  0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 };
+
+static const uint8_t rsbox[256] = {
+  0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb,
+  0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb,
+  0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
+  0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25,
+  0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92,
+  0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
+  0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06,
+  0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b,
+  0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
+  0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e,
+  0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b,
+  0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
+  0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f,
+  0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef,
+  0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
+  0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d };
+
+static const uint8_t Rcon[11] = {
+  0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36 };
+
+#define getSBoxValue(num) (sbox[(num)])
+
+static void KeyExpansion(uint8_t* RoundKey, const uint8_t* Key)
+{
+  unsigned i, j, k;
+  uint8_t tempa[4]; // Used for the column/row operations
+
+  // The first round key is the key itself.
+  for (i = 0; i < Nk; ++i)
+  {
+    RoundKey[(i * 4) + 0] = Key[(i * 4) + 0];
+    RoundKey[(i * 4) + 1] = Key[(i * 4) + 1];
+    RoundKey[(i * 4) + 2] = Key[(i * 4) + 2];
+    RoundKey[(i * 4) + 3] = Key[(i * 4) + 3];
+  }
+
+  // All other round keys are found from the previous round keys.
+  for (i = Nk; i < Nb * (Nr + 1); ++i)
+  {
+    {
+      k = (i - 1) * 4;
+      tempa[0]=RoundKey[k + 0];
+      tempa[1]=RoundKey[k + 1];
+      tempa[2]=RoundKey[k + 2];
+      tempa[3]=RoundKey[k + 3];
+
+    }
+
+    if (i % Nk == 0)
+    {
+      // This function shifts the 4 bytes in a word to the left once.
+      // [a0,a1,a2,a3] becomes [a1,a2,a3,a0]
+
+      // Function RotWord()
+      {
+        const uint8_t u8tmp = tempa[0];
+        tempa[0] = tempa[1];
+        tempa[1] = tempa[2];
+        tempa[2] = tempa[3];
+        tempa[3] = u8tmp;
+      }
+
+      // SubWord() is a function that takes a four-byte input word and
+      // applies the S-box to each of the four bytes to produce an output word.
+
+      // Function Subword()
+      {
+        tempa[0] = getSBoxValue(tempa[0]);
+        tempa[1] = getSBoxValue(tempa[1]);
+        tempa[2] = getSBoxValue(tempa[2]);
+        tempa[3] = getSBoxValue(tempa[3]);
+      }
+
+      tempa[0] = tempa[0] ^ Rcon[i/Nk];
+    }
+
+    if (Nk == 8) //only run if using AES256 (Nk == 8)
+    {
+      if (i % Nk == 4)
+      {
+        // Function Subword()
+        {
+          tempa[0] = getSBoxValue(tempa[0]);
+          tempa[1] = getSBoxValue(tempa[1]);
+          tempa[2] = getSBoxValue(tempa[2]);
+          tempa[3] = getSBoxValue(tempa[3]);
+        }
+      }
+    }
+
+    j = i * 4; k=(i - Nk) * 4;
+    RoundKey[j + 0] = RoundKey[k + 0] ^ tempa[0];
+    RoundKey[j + 1] = RoundKey[k + 1] ^ tempa[1];
+    RoundKey[j + 2] = RoundKey[k + 2] ^ tempa[2];
+    RoundKey[j + 3] = RoundKey[k + 3] ^ tempa[3];
+  }
+}
+
+//input bit array, return output as up to a 64-bit value
+uint64_t convert_bits_into_output_ta(uint8_t * input, int len)
+{
+  int i;
+  uint64_t output = 0;
+  for(i = 0; i < len; i++)
+  {
+    output <<= 1;
+    output |= (uint64_t)(input[i] & 1);
+  }
+  return output;
+}
+
+//take x amount of bits and pack into len amount of bytes (symmetrical)
+void pack_bit_array_into_byte_array_ta (uint8_t * input, uint8_t * output, int len)
+{
+  int i;
+  for (i = 0; i < len; i++)
+    output[i] = (uint8_t)convert_bits_into_output_ta(&input[i*8], 8);
+}
+
+//take len amount of bytes and unpack back into a bit array
+void unpack_byte_array_into_bit_array_ta (uint8_t * input, uint8_t * output, int len)
+{
+  int i = 0, k = 0;
+  for (i = 0; i < len; i++)
+  {
+    output[k++] = (input[i] >> 7) & 1;
+    output[k++] = (input[i] >> 6) & 1;
+    output[k++] = (input[i] >> 5) & 1;
+    output[k++] = (input[i] >> 4) & 1;
+    output[k++] = (input[i] >> 3) & 1;
+    output[k++] = (input[i] >> 2) & 1;
+    output[k++] = (input[i] >> 1) & 1;
+    output[k++] = (input[i] >> 0) & 1;
+  }
+}
+
+void AES_init_ctx(struct AES_ctx* ctx, const uint8_t* key)
+{
+  KeyExpansion(ctx->RoundKey, key);
+}
+void AES_init_ctx_iv(struct AES_ctx* ctx, const uint8_t* key, const uint8_t* iv)
+{
+  KeyExpansion(ctx->RoundKey, key);
+  memcpy (ctx->Iv, iv, AES_BLOCKLEN);
+}
+void AES_ctx_set_iv(struct AES_ctx* ctx, const uint8_t* iv)
+{
+  memcpy (ctx->Iv, iv, AES_BLOCKLEN);
+}
+
+static void AddRoundKey(uint8_t round, state_t* state, const uint8_t* RoundKey)
+{
+  uint8_t i,j;
+  for (i = 0; i < 4; ++i)
+  {
+    for (j = 0; j < 4; ++j)
+    {
+      (*state)[i][j] ^= RoundKey[(round * Nb * 4) + (i * Nb) + j];
+    }
+  }
+}
+
+static void SubBytes(state_t* state)
+{
+  uint8_t i, j;
+  for (i = 0; i < 4; ++i)
+  {
+    for (j = 0; j < 4; ++j)
+    {
+      (*state)[j][i] = getSBoxValue((*state)[j][i]);
+    }
+  }
+}
+
+static void ShiftRows(state_t* state)
+{
+  uint8_t temp;
+
+  // Rotate first row 1 columns to left
+  temp           = (*state)[0][1];
+  (*state)[0][1] = (*state)[1][1];
+  (*state)[1][1] = (*state)[2][1];
+  (*state)[2][1] = (*state)[3][1];
+  (*state)[3][1] = temp;
+
+  // Rotate second row 2 columns to left
+  temp           = (*state)[0][2];
+  (*state)[0][2] = (*state)[2][2];
+  (*state)[2][2] = temp;
+
+  temp           = (*state)[1][2];
+  (*state)[1][2] = (*state)[3][2];
+  (*state)[3][2] = temp;
+
+  // Rotate third row 3 columns to left
+  temp           = (*state)[0][3];
+  (*state)[0][3] = (*state)[3][3];
+  (*state)[3][3] = (*state)[2][3];
+  (*state)[2][3] = (*state)[1][3];
+  (*state)[1][3] = temp;
+}
+
+static uint8_t xtime(uint8_t x)
+{
+  return ((x<<1) ^ (((x>>7) & 1) * 0x1b));
+}
+
+static void MixColumns(state_t* state)
+{
+  uint8_t i;
+  uint8_t Tmp, Tm, t;
+  for (i = 0; i < 4; ++i)
+  {
+    t   = (*state)[i][0];
+    Tmp = (*state)[i][0] ^ (*state)[i][1] ^ (*state)[i][2] ^ (*state)[i][3] ;
+    Tm  = (*state)[i][0] ^ (*state)[i][1] ; Tm = xtime(Tm);  (*state)[i][0] ^= Tm ^ Tmp ;
+    Tm  = (*state)[i][1] ^ (*state)[i][2] ; Tm = xtime(Tm);  (*state)[i][1] ^= Tm ^ Tmp ;
+    Tm  = (*state)[i][2] ^ (*state)[i][3] ; Tm = xtime(Tm);  (*state)[i][2] ^= Tm ^ Tmp ;
+    Tm  = (*state)[i][3] ^ t ;              Tm = xtime(Tm);  (*state)[i][3] ^= Tm ^ Tmp ;
+  }
+}
+
+#define Multiply(x, y)                                \
+      (  ((y & 1) * x) ^                              \
+      ((y>>1 & 1) * xtime(x)) ^                       \
+      ((y>>2 & 1) * xtime(xtime(x))) ^                \
+      ((y>>3 & 1) * xtime(xtime(xtime(x)))) ^         \
+      ((y>>4 & 1) * xtime(xtime(xtime(xtime(x))))))   \
+
+
+#define getSBoxInvert(num) (rsbox[(num)])
+
+static void InvMixColumns(state_t* state)
+{
+  int i;
+  uint8_t a, b, c, d;
+  for (i = 0; i < 4; ++i)
+  {
+    a = (*state)[i][0];
+    b = (*state)[i][1];
+    c = (*state)[i][2];
+    d = (*state)[i][3];
+
+    (*state)[i][0] = Multiply(a, 0x0e) ^ Multiply(b, 0x0b) ^ Multiply(c, 0x0d) ^ Multiply(d, 0x09);
+    (*state)[i][1] = Multiply(a, 0x09) ^ Multiply(b, 0x0e) ^ Multiply(c, 0x0b) ^ Multiply(d, 0x0d);
+    (*state)[i][2] = Multiply(a, 0x0d) ^ Multiply(b, 0x09) ^ Multiply(c, 0x0e) ^ Multiply(d, 0x0b);
+    (*state)[i][3] = Multiply(a, 0x0b) ^ Multiply(b, 0x0d) ^ Multiply(c, 0x09) ^ Multiply(d, 0x0e);
+  }
+}
+
+static void InvSubBytes(state_t* state)
+{
+  uint8_t i, j;
+  for (i = 0; i < 4; ++i)
+  {
+    for (j = 0; j < 4; ++j)
+    {
+      (*state)[j][i] = getSBoxInvert((*state)[j][i]);
+    }
+  }
+}
+
+static void InvShiftRows(state_t* state)
+{
+  uint8_t temp;
+
+  // Rotate first row 1 columns to right
+  temp = (*state)[3][1];
+  (*state)[3][1] = (*state)[2][1];
+  (*state)[2][1] = (*state)[1][1];
+  (*state)[1][1] = (*state)[0][1];
+  (*state)[0][1] = temp;
+
+  // Rotate second row 2 columns to right
+  temp = (*state)[0][2];
+  (*state)[0][2] = (*state)[2][2];
+  (*state)[2][2] = temp;
+
+  temp = (*state)[1][2];
+  (*state)[1][2] = (*state)[3][2];
+  (*state)[3][2] = temp;
+
+  // Rotate third row 3 columns to right
+  temp = (*state)[0][3];
+  (*state)[0][3] = (*state)[1][3];
+  (*state)[1][3] = (*state)[2][3];
+  (*state)[2][3] = (*state)[3][3];
+  (*state)[3][3] = temp;
+}
+
+// Cipher is the main function that encrypts the PlainText,
+// or produces a keystream, depending on application.
+static void Cipher(state_t* state, const uint8_t* RoundKey)
+{
+  uint8_t round = 0;
+
+  // Add the First round key to the state before starting the rounds.
+  AddRoundKey(0, state, RoundKey);
+
+  // There will be Nr rounds.
+  // The first Nr-1 rounds are identical.
+  // These Nr rounds are executed in the loop below.
+  // Last one without MixColumns()
+  for (round = 1; ; ++round)
+  {
+    SubBytes(state);
+    ShiftRows(state);
+    if (round == Nr) {
+      break;
+    }
+    MixColumns(state);
+    AddRoundKey(round, state, RoundKey);
+  }
+  // Add round key to last round
+  AddRoundKey(Nr, state, RoundKey);
+}
+
+static void InvCipher(state_t* state, const uint8_t* RoundKey)
+{
+  uint8_t round = 0;
+
+  // Add the First round key to the state before starting the rounds.
+  AddRoundKey(Nr, state, RoundKey);
+
+  // There will be Nr rounds.
+  // The first Nr-1 rounds are identical.
+  // These Nr rounds are executed in the loop below.
+  // Last one without InvMixColumn()
+  for (round = (Nr - 1); ; --round)
+  {
+    InvShiftRows(state);
+    InvSubBytes(state);
+    AddRoundKey(round, state, RoundKey);
+    if (round == 0) {
+      break;
+    }
+    InvMixColumns(state);
+  }
+
+}
+
+void AES_ECB_encrypt(const struct AES_ctx* ctx, uint8_t* buf)
+{
+  // The next function call encrypts the PlainText with the Key using AES algorithm.
+  Cipher((state_t*)buf, ctx->RoundKey);
+}
+
+void AES_ECB_decrypt(const struct AES_ctx* ctx, uint8_t* buf)
+{
+  // The next function call decrypts the PlainText with the Key using AES algorithm.
+  InvCipher((state_t*)buf, ctx->RoundKey);
+}
+
+static void XorWithIv(uint8_t* buf, const uint8_t* Iv)
+{
+  uint8_t i;
+  for (i = 0; i < AES_BLOCKLEN; ++i)
+  {
+    buf[i] ^= Iv[i];
+  }
+}
+
+void AES_CBC_encrypt_buffer(struct AES_ctx *ctx, uint8_t* buf, size_t length)
+{
+  size_t i;
+  uint8_t *Iv = ctx->Iv;
+  for (i = 0; i < length; i += AES_BLOCKLEN)
+  {
+    XorWithIv(buf, Iv);
+    Cipher((state_t*)buf, ctx->RoundKey);
+    Iv = buf;
+    buf += AES_BLOCKLEN;
+  }
+  /* store Iv in ctx for next call */
+  memcpy(ctx->Iv, Iv, AES_BLOCKLEN);
+}
+
+void AES_CBC_decrypt_buffer(struct AES_ctx* ctx, uint8_t* buf, size_t length)
+{
+  size_t i;
+  uint8_t storeNextIv[AES_BLOCKLEN];
+  for (i = 0; i < length; i += AES_BLOCKLEN)
+  {
+    memcpy(storeNextIv, buf, AES_BLOCKLEN);
+    InvCipher((state_t*)buf, ctx->RoundKey);
+    XorWithIv(buf, ctx->Iv);
+    memcpy(ctx->Iv, storeNextIv, AES_BLOCKLEN);
+    buf += AES_BLOCKLEN;
+  }
+
+}
+
+/* Symmetrical operation: same function for encrypting as for decrypting. Note any IV/nonce should never be reused with the same key */
+void AES_CTR_xcrypt_buffer(struct AES_ctx* ctx, uint8_t* buf, size_t length)
+{
+  uint8_t buffer[AES_BLOCKLEN];
+
+  size_t i;
+  int bi;
+  for (i = 0, bi = AES_BLOCKLEN; i < length; ++i, ++bi)
+  {
+    if (bi == AES_BLOCKLEN) /* we need to regen xor compliment in buffer */
+    {
+
+      memcpy(buffer, ctx->Iv, AES_BLOCKLEN);
+      Cipher((state_t*)buffer,ctx->RoundKey);
+
+      /* Increment Iv and handle overflow */
+      for (bi = (AES_BLOCKLEN - 1); bi >= 0; --bi)
+      {
+	      /* inc will overflow */
+        if (ctx->Iv[bi] == 255)
+	      {
+          ctx->Iv[bi] = 0;
+          continue;
+        }
+        ctx->Iv[bi] += 1;
+        break;
+      }
+      bi = 0;
+    }
+
+    buf[i] = (buf[i] ^ buffer[bi]);
+  }
+
+}
+
+//byte-wise output of AES OFB Keystream
+//input iv is a 16-byte uint8_t array of initialization vector
+//input key is up to 32-byte uint8_t array of key value
+//input type is the type/key len of AES required (0-128, 1-192, 2-256)
+//input nblocks is the number of rounds of 16-byte keystream output blocks requried
+//output is a uint8_t bytewise array, each round filled with 16-bytes from aes keystream output
+void aes_ofb_keystream_output (uint8_t * iv, uint8_t * key, uint8_t * output, int type, int nblocks)
+{
+
+  int i;
+  uint8_t input_register[16]; //OFB Input Register
+  memset (input_register, 0, sizeof(input_register));
+
+  //Set values specific to type (128/192/256)
+  if (type == 0) //128
+  {
+    Nb = 4;
+    Nk = 4;
+    Nr = 10;
+  }
+  else if (type == 1) //192
+  {
+    Nb = 4;
+    Nk = 6;
+    Nr = 12;
+  }
+  else //if (type == 2) //256
+  {
+    Nb = 4;
+    Nk = 8;
+    Nr = 14;
+  }
+
+  struct AES_ctx ctx;
+
+  //load first round of input_register with received IV (OFB First Input Register)
+  memcpy (input_register, iv, 16*sizeof(uint8_t) );
+
+  //initialize the key variable for the Cipher function
+  memset (ctx.RoundKey, 0, 240*sizeof(uint8_t));
+  KeyExpansion(ctx.RoundKey, key);
+
+  //execute the cipher function, and copy ciphered input_register to output for required number of rounds
+  for (i = 0; i < nblocks; i++)
+  {
+    Cipher((state_t*)input_register, ctx.RoundKey); //input_register is returned as output, and is put back in as object feedback
+    memcpy (output+(i*16), input_register, 16*sizeof(uint8_t) ); //copy ciphered input_register to output
+  }
+
+}
+
+//byte-wise AES CFB (Cipher Feedback) Payload operating in 128-bit block mode
+//input in is a uint8_t bytewise array,is the input to be ciphered (encrypted or decrypted)
+//input iv is a 16-byte uint8_t array of initialization vector
+//input key is up to 32-byte uint8_t array of key value
+//input type is the type/key len of AES required (0-128, 1-192, 2-256)
+//input nblocks is the number of rounds of 16-byte payload blocks requried (last block will need padding if not flush)
+//output out is a uint8_t bytewise array, each round filled with 16-bytes of cfb ciphered output (encrypted or decrypted)
+//de is a bit-flag signalling to run Cipher (encrypt) on 1, or InvCipher (decrypt) on 0
+void aes_cfb_bytewise_payload_crypt (uint8_t * iv, uint8_t * key, uint8_t * in, uint8_t * out, int type, int nblocks, int de)
+{
+
+  int i, j;
+  uint8_t input_register[16]; //Input Register
+  memset (input_register, 0, sizeof(input_register));
+
+  //Set values specific to type (128/192/256)
+  if (type == 0) //128
+  {
+    Nb = 4;
+    Nk = 4;
+    Nr = 10;
+  }
+  else if (type == 1) //192
+  {
+    Nb = 4;
+    Nk = 6;
+    Nr = 12;
+  }
+  else //if (type == 2) //256
+  {
+    Nb = 4;
+    Nk = 8;
+    Nr = 14;
+  }
+
+  struct AES_ctx ctx;
+
+  //load first round of input_register with received IV (CFB First Input Register)
+  memcpy (input_register, iv, 16*sizeof(uint8_t) );
+
+  //initialize the key variable for the Cipher function
+  memset (ctx.RoundKey, 0, 240*sizeof(uint8_t));
+  KeyExpansion(ctx.RoundKey, key);
+
+  //execute the cipher function, and copy ciphered input_register to output for required number of rounds
+  for (i = 0; i < nblocks; i++)
+  {
+
+    //the cipher is always run in the foward, or encryption mode
+    Cipher((state_t*)input_register, ctx.RoundKey);
+
+    //xor the current input 'in' to the current state of the input_register for cipher feedback
+    for (j = 0; j < 16; j++)
+      input_register[j] ^= in[j+(i*16)];
+
+    //copy ciphered/xor'd input_register to output 'out'
+    memcpy (out+(i*16), input_register, 16*sizeof(uint8_t) );
+
+    //if running in decryption mode, we feed in the next round of input
+    if (!de)
+      memcpy(input_register, in+(i*16), 16*sizeof(uint8_t));
+
+  }
+
+}
+
+//byte-wise AES CBC (Cipher Block Chaining) //Yeah, I know this already exists, but wanted a custom convenience wrapper version
+//input in is a uint8_t bytewise array,is the input to be ciphered (encrypted or decrypted)
+//input iv is a 16-byte uint8_t array of initialization vector
+//input key is up to 32-byte uint8_t array of key value
+//input type is the type/key len of AES required (0-128, 1-192, 2-256)
+//input nblocks is the number of rounds of 16-byte payload blocks requried (last block will need padding if not flush)
+//output out is a uint8_t bytewise array, each round filled with 16-bytes of cfb ciphered output (encrypted or decrypted)
+//de is a bit-flag signalling to run Cipher (encrypt) on 1, or InvCipher (decrypt) on 0
+void aes_cbc_bytewise_payload_crypt (uint8_t * iv, uint8_t * key, uint8_t * in, uint8_t * out, int type, int nblocks, int de)
+{
+
+  int i, j;
+  uint8_t input_register[16]; //Input Register
+  memset (input_register, 0, sizeof(input_register));
+
+  //Set values specific to type (128/192/256)
+  if (type == 0) //128
+  {
+    Nb = 4;
+    Nk = 4;
+    Nr = 10;
+  }
+  else if (type == 1) //192
+  {
+    Nb = 4;
+    Nk = 6;
+    Nr = 12;
+  }
+  else //if (type == 2) //256
+  {
+    Nb = 4;
+    Nk = 8;
+    Nr = 14;
+  }
+
+  struct AES_ctx ctx;
+
+  //load first round of input_register accordingly
+  if (de)
+    memcpy (input_register, iv, 16*sizeof(uint8_t) );
+  else memcpy (input_register, in, 16*sizeof(uint8_t) );
+
+  //initialize the key variable for the Cipher function
+  memset (ctx.RoundKey, 0, 240*sizeof(uint8_t));
+  KeyExpansion(ctx.RoundKey, key);
+
+  //
+  for (i = 0; i < nblocks; i++)
+  {
+
+    //run encryption or decryption depending on de value
+    if (de) //encrypt
+    {
+
+      //xor the current input 'in' pt to the current state of the input_register for cbc feedback
+      for (j = 0; j < 16; j++)
+        input_register[j] ^= in[j+(i*16)];
+
+      Cipher((state_t*)input_register, ctx.RoundKey);
+
+      //copy ciphered input_register to output 'out'
+      memcpy (out+(i*16), input_register, 16*sizeof(uint8_t) );
+
+    }
+
+    else   //decrypt
+    {
+
+      InvCipher((state_t*)input_register, ctx.RoundKey);
+
+      //copy ciphered input_register to output 'out'
+      memcpy (out+(i*16), input_register, 16*sizeof(uint8_t) );
+
+      //xor the current output by IV, or by last received CT
+      if (i == 0)
+      {
+        for (j = 0; j < 16; j++)
+          out[j] ^= iv[j];
+      }
+      else
+      {
+        for (j = 0; j < 16; j++)
+          out[j+(i*16)] ^= in[j+((i-1)*16)];
+      }
+
+      //copy in next segment for input_register (if not last)
+      if (i < nblocks)
+        memcpy(input_register, in+((i+1)*16), 16*sizeof(uint8_t) );
+
+    }
+
+  }
+
+}
+
+//byte-wise AES CBC_MAC (Cipher Block Chaining Message Authentication) //This is slightly different than above, no IV is present,
+//but if iv is desireable, it will need to be pre-XOR'd with the first plaintext input block by the calling function
+//input in is a uint8_t bytewise array, is the input to be ciphered.
+//input key is up to 32-byte uint8_t array of key value
+//input type is the type/key len of AES required (0-128, 1-192, 2-256)
+//input nblocks is the number of rounds of 16-byte payload blocks requried (last block will need padding if not flush)
+//output out is a uint8_t bytewise array, with only the final round output as the MAC octets
+//NOTE: When doing a cbc_mac, you should only run it in the forward (encryption) mode to get the mac bytes
+void aes_cbc_mac_generator (uint8_t * key, uint8_t * in, uint8_t * out, int type, int nblocks)
+{
+
+  int i, j;
+  uint8_t input_register[16]; //Input Register
+  memset (input_register, 0, sizeof(input_register));
+
+  //Set values specific to type (128/192/256)
+  if (type == 0) //128
+  {
+    Nb = 4;
+    Nk = 4;
+    Nr = 10;
+  }
+  else if (type == 1) //192
+  {
+    Nb = 4;
+    Nk = 6;
+    Nr = 12;
+  }
+  else //if (type == 2) //256
+  {
+    Nb = 4;
+    Nk = 8;
+    Nr = 14;
+  }
+
+  struct AES_ctx ctx;
+
+  //initialize the key variable for the Cipher function
+  memset (ctx.RoundKey, 0, 240*sizeof(uint8_t));
+  KeyExpansion(ctx.RoundKey, key);
+
+  //
+  for (i = 0; i < nblocks; i++)
+  {
+
+    //xor the current input 'in' pt to the current state of the input_register for cbc feedback
+    //if this is the first iteration, this will load the first round plain text instead
+    for (j = 0; j < 16; j++)
+      input_register[j] ^= in[j+((i+0)*16)];
+
+    Cipher((state_t*)input_register, ctx.RoundKey);
+
+    //debug, load out all intermediate output register values
+    // memcpy (out+(i*16), input_register, 16*sizeof(uint8_t) );
+
+  }
+
+  //copy final ciphered input_register to output 'out', user will determine how many bytes of output they want for MAC
+  memcpy (out, input_register, 16*sizeof(uint8_t) );
+
+}
+
+//byte-wise output of AES ECB Ciphering/Deciphering
+//input is uint8_t byte-wise (16-bytes) data to be ciphered or deciphered
+//input key is up to 32-byte uint8_t array of key value
+//input type is the type/len of AES required (0-128, 1-192, 2-256)
+//output is a uint8_t bytewise array of ciphered or deciphered input
+//de is a bit-flag signalling to run Cipher (encrypt) on 1, or InvCipher (decrypt) on 0
+void aes_ecb_bytewise_payload_crypt (uint8_t * input, uint8_t * key, uint8_t * output, int type, int de)
+{
+
+  uint8_t input_register[16]; //ECB Input Register
+  memset (input_register, 0, sizeof(input_register));
+
+  //Set values specific to type (128/192/256)
+  if (type == 0) //128
+  {
+    Nb = 4;
+    Nk = 4;
+    Nr = 10;
+  }
+  else if (type == 1) //192
+  {
+    Nb = 4;
+    Nk = 6;
+    Nr = 12;
+  }
+  else //if (type == 2) //256
+  {
+    Nb = 4;
+    Nk = 8;
+    Nr = 14;
+  }
+
+  struct AES_ctx ctx;
+
+  //load input_register with received input (ECB Payload)
+  memcpy (input_register, input, 16*sizeof(uint8_t) );
+
+  //initialize the key variable for the Cipher function
+  memset (ctx.RoundKey, 0, 240*sizeof(uint8_t));
+  KeyExpansion(ctx.RoundKey, key);
+
+  //run encryption or decryption depending on de value
+  if (de) //encrypt
+    Cipher((state_t*)input_register, ctx.RoundKey);
+  else   //decrypt
+    InvCipher((state_t*)input_register, ctx.RoundKey);
+
+  //copy ciphered/deciphered input_register to output
+  memcpy (output, input_register, 16*sizeof(uint8_t) );
+
+}
+
+//symmetrical ctr mode payload encryption and decryption
+void aes_ctr_bitwise_payload_crypt (uint8_t * iv, uint8_t * key, uint8_t * payload, int type)
+{
+
+  //Set values specific to type (128/192/256)
+  if (type == 0) //128
+  {
+    Nb = 4;
+    Nk = 4;
+    Nr = 10;
+  }
+  else if (type == 1) //192
+  {
+    Nb = 4;
+    Nk = 6;
+    Nr = 12;
+  }
+  else //if (type == 2) //256
+  {
+    Nb = 4;
+    Nk = 8;
+    Nr = 14;
+  }
+
+  struct AES_ctx ctx;
+
+  //init and set the iv and key variables
+  memset (ctx.RoundKey, 0, 240*sizeof(uint8_t));
+  memset (ctx.Iv, 0, 16*sizeof(uint8_t));
+
+  KeyExpansion(ctx.RoundKey, key);
+  memcpy (ctx.Iv, iv, AES_BLOCKLEN);
+
+  //pack input bit-wise payload to byte array
+  uint8_t payload_bytes[16];
+  memset (payload_bytes, 0, sizeof(payload_bytes));
+  pack_bit_array_into_byte_array_ta (payload, payload_bytes, 16);
+
+  //pass to internal CTR handler for payload
+  AES_CTR_xcrypt_buffer(&ctx, payload_bytes, 16);
+
+  //unpack output bytes back to bits
+  unpack_byte_array_into_bit_array_ta(payload_bytes, payload, 16);
+
+}
+
+//symmetrical ctr mode payload encryption and decryption
+void aes_ctr_bytewise_payload_crypt (uint8_t * iv, uint8_t * key, uint8_t * payload, int type)
+{
+
+  //Set values specific to type (128/192/256)
+  if (type == 0) //128
+  {
+    Nb = 4;
+    Nk = 4;
+    Nr = 10;
+  }
+  else if (type == 1) //192
+  {
+    Nb = 4;
+    Nk = 6;
+    Nr = 12;
+  }
+  else //if (type == 2) //256
+  {
+    Nb = 4;
+    Nk = 8;
+    Nr = 14;
+  }
+
+  struct AES_ctx ctx;
+
+  //init and set the iv and key variables
+  memset (ctx.RoundKey, 0, 240*sizeof(uint8_t));
+  memset (ctx.Iv, 0, 16*sizeof(uint8_t));
+
+  KeyExpansion(ctx.RoundKey, key);
+  memcpy (ctx.Iv, iv, AES_BLOCKLEN);
+
+  //pass to internal CTR handler for payload
+  AES_CTR_xcrypt_buffer(&ctx, payload, 16);
+
+}
+
--- a/src/crypt-des.c
+++ b/src/crypt-des.c
@@ -0,0 +1,832 @@
+/*-------------------------------------------------------------------------------
+ * des.c         Crypthings
+ * DES Alg
+ *-----------------------------------------------------------------------------*/
+
+#include <string.h>
+#include <stdint.h>
+#include <stddef.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "dsd.h"
+
+//NOTE: The SLUT boxes are S boxes with additional calculations so we don't have
+//to manually sort out row and column values and can cut down on operations
+
+uint8_t SLUT1[64] = {
+0xE0,0x00,0x40,0xF0,0xD0,0x70,0x10,0x40,
+0x20,0xE0,0xF0,0x20,0xB0,0xD0,0x80,0x10,
+0x30,0xA0,0xA0,0x60,0x60,0xC0,0xC0,0xB0,
+0x50,0x90,0x90,0x50,0x00,0x30,0x70,0x80,
+0x40,0xF0,0x10,0xC0,0xE0,0x80,0x80,0x20,
+0xD0,0x40,0x60,0x90,0x20,0x10,0xB0,0x70,
+0xF0,0x50,0xC0,0xB0,0x90,0x30,0x70,0xE0,
+0x30,0xA0,0xA0,0x00,0x50,0x60,0x00,0xD0
+};
+
+uint8_t SLUT2[64] = {
+0x0F,0x03,0x01,0x0D,0x08,0x04,0x0E,0x07,
+0x06,0x0F,0x0B,0x02,0x03,0x08,0x04,0x0E,
+0x09,0x0C,0x07,0x00,0x02,0x01,0x0D,0x0A,
+0x0C,0x06,0x00,0x09,0x05,0x0B,0x0A,0x05,
+0x00,0x0D,0x0E,0x08,0x07,0x0A,0x0B,0x01,
+0x0A,0x03,0x04,0x0F,0x0D,0x04,0x01,0x02,
+0x05,0x0B,0x08,0x06,0x0C,0x07,0x06,0x0C,
+0x09,0x00,0x03,0x05,0x02,0x0E,0x0F,0x09
+};
+
+uint8_t SLUT3[64] = {
+0xA0,0xD0,0x00,0x70,0x90,0x00,0xE0,0x90,
+0x60,0x30,0x30,0x40,0xF0,0x60,0x50,0xA0,
+0x10,0x20,0xD0,0x80,0xC0,0x50,0x70,0xE0,
+0xB0,0xC0,0x40,0xB0,0x20,0xF0,0x80,0x10,
+0xD0,0x10,0x60,0xA0,0x40,0xD0,0x90,0x00,
+0x80,0x60,0xF0,0x90,0x30,0x80,0x00,0x70,
+0xB0,0x40,0x10,0xF0,0x20,0xE0,0xC0,0x30,
+0x50,0xB0,0xA0,0x50,0xE0,0x20,0x70,0xC0
+};
+
+uint8_t SLUT4[64] = {
+0x07,0x0D,0x0D,0x08,0x0E,0x0B,0x03,0x05,
+0x00,0x06,0x06,0x0F,0x09,0x00,0x0A,0x03,
+0x01,0x04,0x02,0x07,0x08,0x02,0x05,0x0C,
+0x0B,0x01,0x0C,0x0A,0x04,0x0E,0x0F,0x09,
+0x0A,0x03,0x06,0x0F,0x09,0x00,0x00,0x06,
+0x0C,0x0A,0x0B,0x01,0x07,0x0D,0x0D,0x08,
+0x0F,0x09,0x01,0x04,0x03,0x05,0x0E,0x0B,
+0x05,0x0C,0x02,0x07,0x08,0x02,0x04,0x0E
+};
+
+uint8_t SLUT5[64] = {
+0x20,0xE0,0xC0,0xB0,0x40,0x20,0x10,0xC0,
+0x70,0x40,0xA0,0x70,0xB0,0xD0,0x60,0x10,
+0x80,0x50,0x50,0x00,0x30,0xF0,0xF0,0xA0,
+0xD0,0x30,0x00,0x90,0xE0,0x80,0x90,0x60,
+0x40,0xB0,0x20,0x80,0x10,0xC0,0xB0,0x70,
+0xA0,0x10,0xD0,0xE0,0x70,0x20,0x80,0xD0,
+0xF0,0x60,0x90,0xF0,0xC0,0x00,0x50,0x90,
+0x60,0xA0,0x30,0x40,0x00,0x50,0xE0,0x30
+};
+
+uint8_t SLUT6[64] = {
+0x0C,0x0A,0x01,0x0F,0x0A,0x04,0x0F,0x02,
+0x09,0x07,0x02,0x0C,0x06,0x09,0x08,0x05,
+0x00,0x06,0x0D,0x01,0x03,0x0D,0x04,0x0E,
+0x0E,0x00,0x07,0x0B,0x05,0x03,0x0B,0x08,
+0x09,0x04,0x0E,0x03,0x0F,0x02,0x05,0x0C,
+0x02,0x09,0x08,0x05,0x0C,0x0F,0x03,0x0A,
+0x07,0x0B,0x00,0x0E,0x04,0x01,0x0A,0x07,
+0x01,0x06,0x0D,0x00,0x0B,0x08,0x06,0x0D
+};
+
+uint8_t SLUT7[64] = {
+0x40,0xD0,0xB0,0x00,0x20,0xB0,0xE0,0x70,
+0xF0,0x40,0x00,0x90,0x80,0x10,0xD0,0xA0,
+0x30,0xE0,0xC0,0x30,0x90,0x50,0x70,0xC0,
+0x50,0x20,0xA0,0xF0,0x60,0x80,0x10,0x60,
+0x10,0x60,0x40,0xB0,0xB0,0xD0,0xD0,0x80,
+0xC0,0x10,0x30,0x40,0x70,0xA0,0xE0,0x70,
+0xA0,0x90,0xF0,0x50,0x60,0x00,0x80,0xF0,
+0x00,0xE0,0x50,0x20,0x90,0x30,0x20,0xC0
+};
+
+uint8_t SLUT8[64] = {
+0x0D,0x01,0x02,0x0F,0x08,0x0D,0x04,0x08,
+0x06,0x0A,0x0F,0x03,0x0B,0x07,0x01,0x04,
+0x0A,0x0C,0x09,0x05,0x03,0x06,0x0E,0x0B,
+0x05,0x00,0x00,0x0E,0x0C,0x09,0x07,0x02,
+0x07,0x02,0x0B,0x01,0x04,0x0E,0x01,0x07,
+0x09,0x04,0x0C,0x0A,0x0E,0x08,0x02,0x0D,
+0x00,0x0F,0x06,0x0C,0x0A,0x09,0x0D,0x00,
+0x0F,0x03,0x03,0x05,0x05,0x06,0x08,0x0B
+};
+
+//initial permutation IP (on input)
+uint8_t initial_register_permutation[64] = {
+58, 50, 42, 34, 26, 18, 10, 2,
+60, 52, 44, 36, 28, 20, 12, 4,
+62, 54, 46, 38, 30, 22, 14, 6,
+64, 56, 48, 40, 32, 24, 16, 8,
+57, 49, 41, 33, 25, 17,  9, 1,
+59, 51, 43, 35, 27, 19, 11, 3,
+61, 53, 45, 37, 29, 21, 13, 5,
+63, 55, 47, 39, 31, 23, 15, 7};
+
+//D-Box Expansion (sometimes noted as E BIT-SELECTION TABLE)
+uint8_t message_expansion[48] = {
+32,  1,  2,  3,  4,  5,
+4,   5,  6,  7,  8,  9,
+8,   9, 10, 11, 12, 13,
+12, 13, 14, 15, 16, 17,
+16, 17, 18, 19, 20, 21,
+20, 21, 22, 23, 24, 25,
+24, 25, 26, 27, 28, 29,
+28, 29, 30, 31, 32,  1};
+
+// (sometimes noted as simply 'P')
+uint8_t right_half_permutation[32] = {
+16,  7, 20, 21,
+29, 12, 28, 17,
+1,  15, 23, 26,
+5,  18, 31, 10,
+2,   8, 24, 14,
+32, 27,  3,  9,
+19, 13, 30,  6,
+22, 11,  4, 25};
+
+//inverse initial PI, a.k.a. final permutation (on output)
+uint8_t final_register_permutation[64] = {
+40,  8, 48, 16, 56, 24, 64, 32,
+39,  7, 47, 15, 55, 23, 63, 31,
+38,  6, 46, 14, 54, 22, 62, 30,
+37,  5, 45, 13, 53, 21, 61, 29,
+36,  4, 44, 12, 52, 20, 60, 28,
+35,  3, 43, 11, 51, 19, 59, 27,
+34,  2, 42, 10, 50, 18, 58, 26,
+33,  1, 41,  9, 49, 17, 57, 25};
+
+//initial key permutation
+uint8_t pc1_key_permutation[56] = {
+57, 49,  41, 33,  25,  17,  9,
+1,  58,  50, 42,  34,  26, 18,
+10,  2,  59, 51,  43,  35, 27,
+19, 11,   3, 60,  52,  44, 36,
+63, 55,  47, 39,  31,  23, 15,
+7,  62,  54, 46,  38,  30, 22,
+14,  6,  61, 53,  45,  37, 29,
+21, 13,   5, 28,  20,  12,  4};
+
+//sub c and d key permutation
+uint8_t pc2_key_permutation[48] = {
+//c bits
+14,17,11,24,1,5,
+3,28,15,6,21,10,
+23,19,12,4,26,8,
+16,7,27,20,13,2,
+//d bits (with -28 offset to simply/only have one permute function)
+13,24,3,9,19,27,
+2,12,23,17,5,20,
+16,21,11,28,6,25,
+18,14,22,8,1,4
+};
+
+uint8_t key_shift_sizes[17] = {
+1,
+1, 1, 2, 2,
+2, 2, 2, 2,
+1, 2, 2, 2,
+2, 2, 2, 1};
+
+uint8_t key_shift_bytes[17] = {
+0x80,
+0x80, 0x80, 0xC0, 0xC0,
+0xC0, 0xC0, 0xC0, 0xC0,
+0x80, 0xC0, 0xC0, 0xC0,
+0xC0, 0xC0, 0xC0, 0x80};
+
+uint8_t key_shift_x[4] = {8,8,8,4};
+
+uint8_t key_shift_y[4] = {1,2,3,0};
+
+//input is byte-wise array, output is byte-wise array
+void permute(uint8_t * input, uint8_t * output, uint8_t * table, uint8_t start, uint8_t end)
+{
+
+  for (uint8_t i = start; i < end; i++)
+  {
+    uint8_t tdiv = (table[i] - 1) / 8;
+    uint8_t tmod = (table[i] - 1) % 8;
+    uint8_t idiv = i/8;
+    uint8_t imod = i%8;
+
+    //need a way to simplify or get rid of all these shifts
+    uint8_t bit = (((input[tdiv] & (0x80 >> tmod)) << tmod) >> imod);
+    output[idiv] |= bit;
+  }
+
+}
+
+void rotate_sub_keys(uint8_t * Kc, uint8_t * Kd, uint8_t shift_size, uint8_t shift_byte)
+{
+
+  uint8_t sb1[4]; memset(sb1, 0, sizeof(sb1));
+  uint8_t sb2[4]; memset(sb2, 0, sizeof(sb2));
+
+  for (uint8_t i = 0; i < 4; i++)
+  {
+    sb1[i] = shift_byte & Kc[i];
+    sb2[i] = shift_byte & Kd[i];
+  }
+
+  for (uint8_t i = 0; i < 4; i++)
+  {
+
+    uint8_t x = key_shift_x[i];
+    uint8_t y = key_shift_y[i];
+
+    Kc[i] <<= shift_size;
+    Kd[i] <<= shift_size;
+
+    Kc[i] |= (sb1[y] >> (x - shift_size));
+    Kd[i] |= (sb2[y] >> (x - shift_size));
+
+  }
+}
+
+void des_cipher (uint8_t * main_key, uint8_t * input_register, uint8_t * output_register, uint8_t de)
+{
+
+  //starting and ending permutations
+  uint8_t initial_permutation[8]; memset(initial_permutation, 0, sizeof(initial_permutation));
+  uint8_t pre_end_permutation[8]; memset(pre_end_permutation, 0, sizeof(pre_end_permutation));
+
+  //intermediate left, right, and expansion/selection arrays
+  uint8_t left[4];  memset(left, 0, sizeof(left));
+  uint8_t right[4]; memset(right, 0, sizeof(right));
+  uint8_t rperm[4]; memset(rperm, 0, sizeof(rperm));
+  uint8_t exp[6];   memset(exp, 0, sizeof(exp));
+  uint8_t sel[4];   memset(sel, 0, sizeof(sel));
+
+  //key sets
+  uint8_t Ks[16][7]; memset(Ks, 0, sizeof(Ks));
+  uint8_t Kc[4];     memset(Kc, 0, sizeof(Kc));
+  uint8_t Kd[4];     memset(Kd, 0, sizeof(Kd));
+
+  //initial Ks permutation and shuffle to Kc and Kd
+  permute (main_key, Ks[0], pc1_key_permutation, 0, 56);
+  for (uint8_t i = 0; i < 3; i++)
+  {
+    Kc[i] = Ks[0][i];
+  }
+  Kc[3] = Ks[0][3] & 0xF0;
+  for (uint8_t i = 0; i < 3; i++)
+  {
+    Kd[i]  = (Ks[0][i+3] & 0x0F) << 4;
+    Kd[i] |= (Ks[0][i+4] & 0xF0) >> 4;
+  }
+  Kd[3] = (Ks[0][6] & 0x0F) << 4;
+
+  //reset Ks
+  memset(Ks, 0, sizeof(Ks));
+
+  //create the 16 Ks rounds
+  for (uint8_t i = 0; i < 16; i++)
+  {
+    uint8_t shift_size = key_shift_sizes[i+1];
+    uint8_t shift_byte = key_shift_bytes[i+1];
+    rotate_sub_keys(Kc, Kd, shift_size, shift_byte);
+    permute (Kc, Ks[i], pc2_key_permutation, 0, 24);
+    permute (Kd, Ks[i], pc2_key_permutation, 24, 48);
+  }
+
+  //permute the input_register with the ip (initial_register_permutation) table
+  permute (input_register, initial_permutation, initial_register_permutation, 0, 64);
+
+  //copy the initial permutation to left and right half arrays
+  memcpy (left, initial_permutation+0, sizeof(left));
+  memcpy (right, initial_permutation+4, sizeof(right));
+
+  //16 fiestel rounds
+  for (uint8_t f = 0; f < 16; f++)
+  {
+
+    //reset rperm and exp arrays
+    memset(rperm, 0, sizeof(rperm));
+    memset(exp, 0, sizeof(exp));
+
+    //expand right half from 32-bit to 48-bit
+    permute (right, exp, message_expansion, 0, 48);
+
+    //apply current iteration keyset to the expanded array (encryption cycles Ks forward, decryption goes in reverse)
+    if (de == 1)
+    {
+      for (uint8_t i = 0; i < 6; i++)
+        exp[i] ^= Ks[f][i];
+    }
+    else
+    {
+      for (uint8_t i = 0; i < 6; i++)
+        exp[i] ^= Ks[15-f][i];
+    }
+
+    //extract 6 bits for each sbox swap from the expanded array
+    uint8_t e1 =   exp[0] >> 2;
+    uint8_t e2 = ((exp[0] & 0x3) << 4) | (exp[1] >> 4);
+    uint8_t e3 = ((exp[1] & 0xF) << 2) | (exp[2] >> 6);
+    uint8_t e4 =   exp[2] & 0x3F;
+
+    uint8_t e5 =   exp[3] >> 2;
+    uint8_t e6 = ((exp[3] & 0x3) << 4) | (exp[4] >> 4);
+    uint8_t e7 = ((exp[4] & 0xF) << 2) | (exp[5] >> 6);
+    uint8_t e8 =   exp[5] & 0x3F;
+
+    //select 32-bits of each 48-bit expansion via modified S Box Look Up Tables
+    //swap the 6 bits for 4 bits via SLUT tables and OR them together into a selection array
+    sel[0] = SLUT1[e1] | SLUT2[e2];
+    sel[1] = SLUT3[e3] | SLUT4[e4];
+    sel[2] = SLUT5[e5] | SLUT6[e6];
+    sel[3] = SLUT7[e7] | SLUT8[e8];
+
+    //permute the selected 32-bits into a new right half
+    permute (sel, rperm, right_half_permutation, 0, 32);
+
+    //xor new right half against left half
+    for (uint8_t i = 0; i < 4; i++)
+      rperm[i] ^= left[i];
+
+    //swap old right half to left, set new right half to rperm
+    memcpy (left, right, sizeof(left));
+    memcpy (right, rperm, sizeof(right));
+
+  } //end fiestel rounds f
+
+  //combine right and left into the pre_end_permutation array
+  memcpy (pre_end_permutation+0, right, sizeof(right));
+  memcpy (pre_end_permutation+4, left, sizeof(left));
+
+  //carry out the final permuation to get the completed output_register for this cipher iteration
+  permute (pre_end_permutation, output_register, final_register_permutation, 0, 64);
+
+}
+
+void des56_ofb_keystream_output (uint8_t * main_key, uint8_t * iv, uint8_t * ks_bytes, uint8_t de, int16_t nblocks)
+{
+
+  //cipher input and output
+  uint8_t input_register[8];  memset(input_register, 0, sizeof(input_register));
+  uint8_t output_register[8]; memset(output_register, 0, sizeof(output_register));
+
+  //copy the IV to the input_register (make copy so we don't manipulate the calling functions copy)
+  memcpy(input_register, iv, sizeof(input_register));
+
+  //execute the des_cipher in output feedback mode
+  for (int16_t i = 0; i < nblocks; i++)
+  {
+    //de should be 1 here for encryption mode
+    des_cipher(main_key, input_register, output_register, de);
+    memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input register
+    memcpy(ks_bytes+(i*8), output_register, sizeof(output_register)); //copy output_register to ks_bytes + iteration offset of times 8
+    memset(output_register, 0, sizeof(output_register)); //reset output register
+  }
+
+}
+
+//the des_cipher function is already ECB mode, this convenience wrapper is just available as a reminder to illustrate that point
+void des56_ecb_payload_crypt (uint8_t * main_key, uint8_t * input_register, uint8_t * output_register, uint8_t de)
+{
+  //de 1 for encryption mode, 0 for decryption mode
+  des_cipher(main_key, input_register, output_register, de);
+}
+
+//TDEA, or triple data encryption algorithm, or triple DES, in electronic codebook mode
+void tdea_ecb_payload_crypt (uint8_t * K1, uint8_t * K2, uint8_t * K3, uint8_t * input, uint8_t * output, uint8_t de)
+{
+
+  //cipher input and output
+  uint8_t input_register[8];  memset(input_register, 0, sizeof(input_register));
+  uint8_t output_register[8]; memset(output_register, 0, sizeof(output_register));
+
+  //copy the input to the input_register (make copy so we don't manipulate the calling functions copy)
+  memcpy(input_register, input, sizeof(input_register));
+
+  //For TDEA, the cipher alternates between encryption and decryption to the payload
+  //so, for example, K1 is run as de=1, K2 is run as de=0, and K3 is run as de=1,
+  //K1 and K3 will always use the same mode and K2 will be the opposite
+
+  //NOTE: If running ECB mode in decryption, make sure to send the keys in reverse order
+  //so that its K3, K2, and K1 for decryption, and K1, K2, K3 for encryption
+
+  //K1
+  des_cipher(K1, input_register, output_register, de);
+  memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+  memset(output_register, 0, sizeof(output_register)); //reset output register
+
+  //K2
+  de = (de ^ 1) & 1; //flip the de bit
+  des_cipher(K2, input_register, output_register, de);
+  memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+  memset(output_register, 0, sizeof(output_register)); //reset output register
+
+  //K3
+  de = (de ^ 1) & 1; //flip the de bit back
+  des_cipher(K3, input_register, output_register, de);
+
+  //copy payload out
+  memcpy(output, output_register, sizeof(output_register)); //copy output_register to output
+
+}
+
+//TDEA, or triple data encryption algorithm, or triple DES, in cipher block chain mode (64-bit)
+//same as usual inputs (byte wise), also, if needing DES56, just feed the same key into K1, K2, and K3
+//if running in decryption mode, this will reverse the key bundle order from (K1, K2, K3) to (K3, K2, K1) on this end
+void tdea_cbc_payload_crypt (uint8_t * K1, uint8_t * K2, uint8_t * K3, uint8_t * iv, uint8_t * in, uint8_t * out, int16_t nblocks, uint8_t de)
+{
+
+  int16_t i, j;
+
+  //cipher input and output
+  uint8_t input_register[8];  memset(input_register, 0, sizeof(input_register));
+  uint8_t output_register[8]; memset(output_register, 0, sizeof(output_register));
+
+  //load first round of input_register accordingly
+  if (de)
+    memcpy (input_register, iv, sizeof(input_register)); //load the IV as first input_register if encrypting
+  else memcpy (input_register, in, sizeof(input_register)); //load first cipher text as input_register is decrypting
+
+  //run payload for number of payload nblocks required
+  for (i = 0; i < nblocks; i++)
+  {
+
+    if (de)
+    {
+
+      //xor the current input 'in' pt to the current state of the input_register for cbc feedback
+      for (j = 0; j < 8; j++)
+        input_register[j] ^= in[j+(i*8)];
+
+      //K1
+      des_cipher(K1, input_register, output_register, de);
+      memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+      memset(output_register, 0, sizeof(output_register)); //reset output register
+
+      //K2
+      de = (de ^ 1) & 1; //flip the de bit
+      des_cipher(K2, input_register, output_register, de);
+      memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+      memset(output_register, 0, sizeof(output_register)); //reset output register
+
+      //K3
+      de = (de ^ 1) & 1; //flip the de bit back
+      des_cipher(K3, input_register, output_register, de);
+      memcpy (input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+
+      //copy ciphered output_register to output 'out'
+      memcpy (out+(i*8), output_register, sizeof(output_register));
+      memset(output_register, 0, sizeof(output_register)); //reset output register
+
+    }
+    else
+    {
+
+      //K3
+      des_cipher(K3, input_register, output_register, de);
+      memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+      memset(output_register, 0, sizeof(output_register)); //reset output register
+
+      //K2
+      de = (de ^ 1) & 1; //flip the de bit
+      des_cipher(K2, input_register, output_register, de);
+      memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+      memset(output_register, 0, sizeof(output_register)); //reset output register
+
+      //K1
+      de = (de ^ 1) & 1; //flip the de bit back
+      des_cipher(K1, input_register, output_register, de);
+      memcpy (input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+
+      //copy ciphered input_register to output 'out'
+      memcpy (out+(i*8), output_register, sizeof(output_register));
+
+      //xor the current output by IV, or by last received CT, depending on round
+      if (i == 0)
+      {
+        for (j = 0; j < 8; j++)
+          out[j] ^= iv[j];
+      }
+      else
+      {
+        for (j = 0; j < 8; j++)
+          out[j+(i*8)] ^= in[j+((i-1)*8)];
+      }
+
+      //copy in next segment for input_register (if not last)
+      if (i < nblocks)
+        memcpy(input_register, in+((i+1)*8), sizeof(input_register));
+
+      memset(output_register, 0, sizeof(output_register)); //reset output register
+    }
+
+  }
+
+}
+
+//TDEA, or triple data encryption algorithm, or triple DES, in cipher block chain mode (64-bit)
+//same as usual inputs (byte wise), also, if needing DES56, just feed the same key into K1, K2, and K3
+//only the last output_register is returned for the variable len MAC bytes, always run in encryption mode
+//but if iv is desireable, it will need to be pre-XOR'd with the first plaintext input block by the calling function
+void tdea_cbc_mac_generator (uint8_t * K1, uint8_t * K2, uint8_t * K3, uint8_t * in, uint8_t * out, int16_t nblocks)
+{
+
+  int16_t i, j;
+
+  //cipher input and output
+  uint8_t input_register[8];  memset(input_register, 0, sizeof(input_register));
+  uint8_t output_register[8]; memset(output_register, 0, sizeof(output_register));
+
+  //run payload for number of payload nblocks required
+  for (i = 0; i < nblocks; i++)
+  {
+
+    //the cipher is always run in the foward, or encryption mode (1,0,1)
+
+    //xor the current input 'in' pt to the current state of the input_register for cbc feedback
+    for (j = 0; j < 8; j++)
+      input_register[j] ^= in[j+(i*8)];
+
+    //K1
+    des_cipher(K1, input_register, output_register, 1);
+    memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+    memset(output_register, 0, sizeof(output_register)); //reset output register
+
+    //K2
+    des_cipher(K2, input_register, output_register, 0);
+    memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+    memset(output_register, 0, sizeof(output_register)); //reset output register
+
+    //K3
+    des_cipher(K3, input_register, output_register, 1);
+    memcpy (input_register, output_register, sizeof(output_register));
+
+    //copy ciphered output_register to output 'out'
+    //Since we only want the last output_register,
+    //this will overwrite the out until completion
+    memcpy (out, output_register, sizeof(output_register));
+
+    memset(output_register, 0, sizeof(output_register)); //reset output register
+
+  }
+
+}
+
+//TDEA, or triple data encryption algorithm, or triple DES, in cihper feedback mode (64-bit)
+//same as usual inputs (byte wise), also, if needing DES56, just feed the same key into K1, K2, and K3
+void tdea_cfb_payload_crypt (uint8_t * K1, uint8_t * K2, uint8_t * K3, uint8_t * iv, uint8_t * in, uint8_t * out, int16_t nblocks, uint8_t de)
+{
+
+  int16_t i, j;
+
+  //cipher input and output
+  uint8_t input_register[8];  memset(input_register, 0, sizeof(input_register));
+  uint8_t output_register[8]; memset(output_register, 0, sizeof(output_register));
+
+  //copy the IV to the input_register (make copy so we don't manipulate the calling functions copy)
+  memcpy(input_register, iv, sizeof(input_register));
+
+  //execute the des_cipher in output feedback mode 3 times using each key and transferring output to input each time
+  for (i = 0; i < nblocks; i++)
+  {
+
+    //the cipher is always run in the foward, or encryption mode (1,0,1)
+
+    //K1
+    des_cipher(K1, input_register, output_register, 1);
+    memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+    memset(output_register, 0, sizeof(output_register)); //reset output register
+
+    //K2
+    des_cipher(K2, input_register, output_register, 0);
+    memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+    memset(output_register, 0, sizeof(output_register)); //reset output register
+
+    //K3
+    des_cipher(K3, input_register, output_register, 1);
+
+    //xor the current input 'in' to the current state of the input_register for cipher feedback
+    for (j = 0; j < 8; j++)
+      output_register[j] ^= in[j+(i*8)];
+
+    memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+
+    //copy keystream out and reset
+    memcpy(out+(i*8), output_register, sizeof(output_register)); //copy output_register to ks_bytes + iteration offset of times 8
+    memset(output_register, 0, sizeof(output_register)); //reset output register
+
+    //if running in decryption mode, we feed in the next round of input
+    if (!de)
+      memcpy(input_register, in+(i*8), sizeof(input_register));
+  }
+
+}
+
+//TDEA, or triple data encryption algorithm, or triple DES, in IV counter mode (tested, working)
+void tdea_ctr_payload_crypt (uint8_t * K1, uint8_t * K2, uint8_t * K3, uint8_t * iv, uint8_t * input, uint8_t * output, int16_t nblocks)
+{
+
+  int16_t i, j;
+
+  //cipher input and output
+  uint8_t input_register[8];  memset(input_register, 0, sizeof(input_register));
+  uint8_t output_register[8]; memset(output_register, 0, sizeof(output_register));
+
+  //copy the IV to the input_register (ctr mode will manipulate the IV, since it needs to keep a rolling counter
+  memcpy(input_register, iv, sizeof(input_register));
+
+  //execute the des_cipher in counter mode 3 times using each key and transferring output to input each time
+  //then the IV is iterated and fed back into the input_register to start the next nblocks loop
+  for (i = 0; i < nblocks; i++)
+  {
+
+    //CTR mode cipher should always run in the forward (encryption) mode
+
+    //K1
+    des_cipher(K1, input_register, output_register, 1);
+    memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+    memset(output_register, 0, sizeof(output_register)); //reset output register
+
+    //K2
+    des_cipher(K2, input_register, output_register, 0);
+    memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+    memset(output_register, 0, sizeof(output_register)); //reset output register
+
+    //K3
+    des_cipher(K3, input_register, output_register, 1);
+
+    //set output at current pointer to the xor of input current pointer and the output_register
+    for (j = 0; j < 8; j++)
+      output[j+(i*8)] = input[j+(i*8)] ^ output_register[j];
+
+    memset(output_register, 0, sizeof(output_register)); //reset output register
+
+    //increment the IV, and handle roll over (uint8_t will rollover to 0 after 0xFF)
+    for (j = 7; j >= 0; j--)
+    {
+      iv[j]++;
+      if (iv[j] == 0)
+        continue;
+      else break;
+    }
+
+    //debug IV iteration
+    // fprintf (stderr, "\n IV: ");
+    // for (j = 0; j < 8; j++)
+    //   fprintf (stderr, "%02X", iv[j]);
+
+    //feed the new IV into the input register
+    memcpy (input_register, iv, sizeof(input_register));
+
+  }
+
+}
+
+//TDEA, or triple data encryption algorithm, or triple DES, in output feedback mode
+void tdea_tofb_keystream_output (uint8_t * K1, uint8_t * K2, uint8_t * K3, uint8_t * iv, uint8_t * ks_bytes, uint8_t de, int16_t nblocks)
+{
+
+  //cipher input and output
+  uint8_t input_register[8];  memset(input_register, 0, sizeof(input_register));
+  uint8_t output_register[8]; memset(output_register, 0, sizeof(output_register));
+
+  //copy the IV to the input_register (make copy so we don't manipulate the calling functions copy)
+  memcpy(input_register, iv, sizeof(input_register));
+
+  //execute the des_cipher in output feedback mode 3 times using each key and transferring output to input each time
+  for (int16_t i = 0; i < nblocks; i++)
+  {
+    //K1
+    des_cipher(K1, input_register, output_register, de);
+    memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+    memset(output_register, 0, sizeof(output_register)); //reset output register
+
+    //K2
+    de = (de ^ 1) & 1; //flip the de bit
+    des_cipher(K2, input_register, output_register, de);
+    memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+    memset(output_register, 0, sizeof(output_register)); //reset output register
+
+    //K3
+    de = (de ^ 1) & 1; //flip the de bit back
+    des_cipher(K3, input_register, output_register, de);
+    memcpy(input_register, output_register, sizeof(output_register)); //recycle output_register back into input_register
+
+    //copy keystream out and reset
+    memcpy(ks_bytes+(i*8), output_register, sizeof(output_register)); //copy output_register to ks_bytes + iteration offset of times 8
+    memset(output_register, 0, sizeof(output_register)); //reset output register
+  }
+
+}
+
+//a linear feedback shift register with maximal taps on 64-bit values that can be run to any specified len,
+//its input is a byte array of up to 8 bytes, and its output is same array packed with new LFSR value in it.
+uint64_t lfsr_64_to_len_ca(uint8_t * iv, int16_t len)
+{
+
+  uint64_t lfsr = 0, bit = 0;
+
+  lfsr = ((uint64_t)iv[0] << 56ULL) + ((uint64_t)iv[1] << 48ULL) + ((uint64_t)iv[2] << 40ULL) + ((uint64_t)iv[3] << 32ULL) +
+         ((uint64_t)iv[4] << 24ULL) + ((uint64_t)iv[5] << 16ULL) + ((uint64_t)iv[6] << 8ULL)  + ((uint64_t)iv[7] << 0ULL);
+
+  memset (iv, 0, 8*sizeof(uint8_t));
+
+  for(int16_t cnt = 0; cnt < len; cnt++)
+  {
+    //63,61,45,37,27,14
+    // Polynomial is C(x) = x^64 + x^62 + x^46 + x^38 + x^27 + x^15 + 1
+    bit = ((lfsr >> 63) ^ (lfsr >> 61) ^ (lfsr >> 45) ^ (lfsr >> 37) ^ (lfsr >> 26) ^ (lfsr >> 14)) & 0x1;
+    lfsr = (lfsr << 1) | bit;
+  }
+
+  for (int16_t i = 0; i < 8; i++)
+    iv[i] = (lfsr >> (56-(i*8))) & 0xFF;
+
+  // fprintf (stderr, "\n IV(%02d): ", len);
+  // for (int16_t i = 0; i < 8; i++)
+  //   fprintf (stderr, "%02X", iv[i]);
+
+  return bit;
+
+}
+
+void des56_ca_keystream_output (uint8_t * main_key, uint8_t * iv, uint8_t * ks_bytes, uint8_t de, int16_t ff, int16_t nbits)
+{
+
+  //cipher input and output
+  uint8_t input_register[8];  memset(input_register, 0, sizeof(input_register));
+  uint8_t output_register[8]; memset(output_register, 0, sizeof(output_register));
+
+  //copy the IV to the input_register (make copy so we don't manipulate the calling functions copy)
+  memcpy(input_register, iv, sizeof(input_register));
+
+  //fast forward the current input_register state
+  lfsr_64_to_len_ca(input_register, ff);
+
+  //execute the des_cipher in (CA) mode with 1-bit output
+  for (int16_t i = 0; i < nbits; i++)
+  {
+
+    //de should be 1 here for encryption mode
+    des_cipher(main_key, input_register, output_register, de);
+
+    //keystream accumulation, shift current byte and append
+    //single bit from current output register's most significant bit
+    ks_bytes[i/8] <<= 1;
+    ks_bytes[i/8] |= ((output_register[0] >> 7) & 1);
+
+    //advance the input_register with the lfsr 1 time
+    lfsr_64_to_len_ca(input_register, 1);
+
+    //reset output register
+    memset(output_register, 0, sizeof(output_register));
+
+  }
+
+  // fprintf (stderr, "\n  IR: ");
+  // for (int16_t i = 0; i < 8; i++)
+  //   fprintf (stderr, "%02X", input_register[i]);
+
+}
+
+//transitional function mainly to load key and iv into an array
+void des_multi_keystream_output (unsigned long long int mi, unsigned long long int key_ulli, uint8_t * output, int type, int len)
+{
+  int i = 0;
+  uint8_t iv[8]; memset (iv, 0, sizeof(iv));
+  uint8_t key[8]; memset(key, 0, sizeof(key));
+
+  //convert unsinged long long int values into array values
+  for (i = 7; i >= 0; i--)
+    iv[7-i] = (mi >> (8*i)) & 0xFF;
+
+  for (i = 7; i >= 0; i--)
+    key[7-i] = (key_ulli >> (8*i)) & 0xFF;
+
+  //debug
+  // fprintf (stderr, "\n  IV: ");
+  // for (i = 0; i < 8; i++)
+  //   fprintf (stderr, "%02X", iv[i]);
+  // fprintf (stderr, "\n Key: ");
+  // for (i = 0; i < 8; i++)
+  //   fprintf (stderr, "%02X", key[i]);
+
+  //types: 1 = DES56 OFB; 2 = DES56 CA (XL)
+  if (type == 2)
+  {
+    if (len == 0)
+      des56_ca_keystream_output(key, iv, output, 1, 110+696, 1704);
+    else des56_ca_keystream_output(key, iv, output, 1, 110+000, 1704);
+  }
+  else des56_ofb_keystream_output(key, iv, output, 1, len);
+
+}
+
+//transitional function mainly to load iv into an array
+void tdea_multi_keystream_output (unsigned long long int mi, uint8_t * key, uint8_t * output, int type, int len)
+{
+  int i = 0;
+  uint8_t iv[8]; memset (iv, 0, sizeof(iv));
+
+  //convert unsinged long long int values into array values
+  for (i = 7; i >= 0; i--)
+    iv[7-i] = (mi >> (8*i)) & 0xFF;
+
+  //debug
+  // fprintf (stderr, "\n  IV: ");
+  // for (i = 0; i < 8; i++)
+  //   fprintf (stderr, "%02X", iv[i]);
+
+  //type 1 = TDEA TOFB //TODO: Add more types like 2DES?
+  if (type == 1)
+    tdea_tofb_keystream_output(key, key+8, key+16, iv, output, 1, len);
+  else tdea_tofb_keystream_output(key, key+8, key+16, iv, output, 1, len);
+
+}
--- a/src/crypt-etc.c
+++ b/src/crypt-etc.c
@@ -0,0 +1,126 @@
+#include "dsd.h"
+
+void ken_dmr_scrambler_keystream_creation(dsd_state * state, char * input)
+{
+  /*
+  SLOT 1 Protected LC  FLCO=0x00 FID=0x20 <--this link appears to indicate scrambler usage from Kenwood on DMR
+  DMR PDU Payload [80][20][40][00][00][01][00][00][01] SB: 00000000000 - 000;
+
+  SLOT 1 TGT=1 SRC=1 FLCO=0x00 FID=0x00 SVC=0x00 Group Call <--different call, no scrambler from same Kenwood Radio
+  DMR PDU Payload [00][00][00][00][00][01][00][00][01]
+
+  For This, we could possible transition this to not be enforced
+  since we may have a positive indicator in link control, 
+  but needs further samples and validation
+  */
+
+  int lfsr = 0, bit = 0;
+  sscanf (input, "%d", &lfsr);
+  fprintf (stderr,"DMR Kenwood 15-bit Scrambler Key %05d with Forced Application\n", lfsr);
+
+  for (int i = 0; i < 882; i++)
+  {
+    state->static_ks_bits[0][i] = lfsr & 0x1;
+    state->static_ks_bits[1][i] = lfsr & 0x1;
+    bit = ( (lfsr >> 1) ^ (lfsr >> 0) ) & 1;
+    lfsr =  ( (lfsr >> 1 ) | (bit << 14) );
+  }
+
+  state->ken_sc = 1;
+
+}
+
+void anytone_bp_keystream_creation(dsd_state * state, char * input)
+{
+  uint16_t key = 0;
+  uint16_t kperm = 0;
+  
+  sscanf (input, "%hX", &key);
+  key &= 0xFFFF; //truncate to 16-bits
+
+  //calculate key permutation using simple operations
+  uint8_t nib1, nib2, nib3, nib4;
+
+  //nib 1 and 3 are simple inversions
+  nib1 = ~(key >> 12) & 0xF;
+  nib3 = ~(key >> 4)  & 0xF;
+
+  //nib 2 and 4 are +8 and mod 16 (& 0xF)
+  nib2 = (((key >> 8) & 0xF) + 8) % 16;
+  nib4 = (((key >> 0) & 0xF) + 8) % 16;
+
+  //debug
+  // fprintf (stderr, "{%01X, %01X, %01X, %01X}", nib1, nib2, nib3, nib4);
+
+  kperm = nib1;
+  kperm <<= 4;
+  kperm |= nib2;
+  kperm <<= 4;
+  kperm |= nib3;
+  kperm <<= 4;
+  kperm |= nib4;
+
+  //load bits into static keystream
+  for (int i = 0; i < 16; i++)
+  {
+    state->static_ks_bits[0][i] = (kperm >> (15-i)) & 1;
+    state->static_ks_bits[1][i] = (kperm >> (15-i)) & 1;
+  }
+
+  fprintf (stderr,"DMR Anytone Basic 16-bit Key 0x%04X with Forced Application\n", key);
+  state->any_bp = 1;
+
+}
+
+void straight_mod_xor_keystream_creation(dsd_state * state, char * input)
+{
+  uint16_t len = 0;
+  char * curr;
+  curr = strtok(input, ":"); //should be len (mod) of key (decimal)
+  if (curr != NULL)
+    sscanf (curr, "%hd", &len);
+  else goto END_KS;
+
+  //len sanity check, can't be greater than 882
+  if (len > 882)
+    len = 882;
+
+  curr = strtok(NULL, ":"); //should be key in hex
+  if (curr != NULL)
+  {
+    //continue
+  }
+  else goto END_KS;
+
+  uint8_t ks_bytes[112];
+  memset (ks_bytes, 0, sizeof(ks_bytes));
+  parse_raw_user_string(curr, ks_bytes);
+
+  uint8_t ks_bits[896];
+  memset(ks_bits, 0, sizeof(ks_bits));
+
+  uint16_t unpack_len = len / 8;
+  if (len % 8)
+    unpack_len++;
+  unpack_byte_array_into_bit_array(ks_bytes, ks_bits, unpack_len);
+
+  for (uint16_t i = 0; i < len; i++)
+  {
+    state->static_ks_bits[0][i] = ks_bits[i];
+    state->static_ks_bits[1][i] = ks_bits[i];
+  }
+
+  fprintf (stderr,"AMBE Straight XOR %d-bit Keystream: ", len);
+  for (uint16_t i = 0; i < unpack_len; i++)
+    fprintf (stderr, "%02X", ks_bytes[i]);
+  fprintf (stderr, " with Forced Application \n");
+
+  state->straight_ks = 1;
+  state->straight_mod = (int)len;
+
+  END_KS:
+
+  if (curr == NULL)
+    fprintf (stderr, "Straight KS String Malformed! No KS Created!\n");
+
+}
--- a/src/crypt-kir.c
+++ b/src/crypt-kir.c
@@ -0,0 +1,417 @@
+#include "dsd.h"
+#include "pc4.h"
+
+/* === Global MD2II buffers === */
+int x1, x2, i, n1global;
+unsigned char h2[n1];
+unsigned char h1[n1*3];
+
+/* === MD2II functions === */
+void MD2II_init()
+{
+    x1 = 0;
+    x2 = 0;
+    for (i = 0; i < n1global; i++)
+        h2[i] = 0;
+    for (i = 0; i < n1global; i++)
+        h1[i] = 0;
+}
+
+void MD2II_hashing(unsigned char t1[], size_t b6)
+{
+    static unsigned char s4[256] =
+    {13,199,11,67,237,193,164,77,115,184,141,222,73,
+     38,147,36,150,87,21,104,12,61,156,101,111,145,
+     119,22,207,35,198,37,171,167,80,30,219,28,213,
+     121,86,29,214,242,6,4,89,162,110,175,19,157,
+     3,88,234,94,144,118,159,239,100,17,182,173,238,
+     68,16,79,132,54,163,52,9,58,57,55,229,192,
+     170,226,56,231,187,158,70,224,233,245,26,47,32,
+     44,247,8,251,20,197,185,109,153,204,218,93,178,
+     212,137,84,174,24,120,130,149,72,180,181,208,255,
+     189,152,18,143,176,60,249,27,227,128,139,243,253,
+     59,123,172,108,211,96,138,10,215,42,225,40,81,
+     65,90,25,98,126,154,64,124,116,122,5,1,168,
+     83,190,131,191,244,240,235,177,155,228,125,66,43,
+     201,248,220,129,188,230,62,75,71,78,34,31,216,
+     254,136,91,114,106,46,217,196,92,151,209,133,51,
+     236,33,252,127,179,69,7,183,105,146,97,39,15,
+     205,112,200,166,223,45,48,246,186,41,148,140,107,
+     76,85,95,194,142,50,49,134,23,135,169,221,210,
+     203,63,165,82,161,202,53,14,206,232,103,102,195,
+     117,250,99,0,74,160,241,2,113};
+
+    int b1, b2, b3, b4 = 0, b5;
+
+    while (b6) {
+        for (; b6 && x2 < n1global; b6--, x2++) {
+            b5 = t1[b4++];
+            h1[x2 + n1global] = b5;
+            h1[x2 + (n1global*2)] = b5 ^ h1[x2];
+            x1 = h2[x2] ^= s4[b5 ^ x1];
+        }
+
+        if (x2 == n1global) {
+            b2 = 0;
+            x2 = 0;
+            for (b3 = 0; b3 < (n1global+2); b3++) {
+                for (b1 = 0; b1 < (n1global*3); b1++)
+                    b2 = h1[b1] ^= s4[b2];
+                b2 = (b2 + b3) % 256;
+            }
+        }
+    }
+}
+
+void MD2II_end(unsigned char h4[n1])
+{
+    unsigned char h3[n1];
+    int i, n4;
+    n4 = n1global - x2;
+    for (i = 0; i < n4; i++) h3[i] = n4;
+    MD2II_hashing(h3, n4);
+    MD2II_hashing(h2, n1global);
+    for (i = 0; i < n1global; i++) h4[i] = h1[i];
+}
+
+void print_hex(const unsigned char *buf, int len)
+{
+    for (int i = 0; i < len; i++)
+        printf("%02X ", buf[i]);
+    printf("\n");
+}
+
+static inline uint64_t rol48(uint64_t x, int n)
+{
+    return ((x << n) | (x >> 47)) & 0xffffffffffff;
+}
+
+/* === Keystream (A5-like) === */
+static int threshold(uint64_t r1, uint64_t r2, uint64_t r3)
+{
+    int total = (((r1 >> 31) & 1) == 1) +
+                (((r2 >> 31) & 1) == 1) +
+                (((r3 >> 31) & 1) == 1);
+    return (total > 1) ? 0 : 1;
+}
+
+static uint64_t clock_r1(int ctl, uint64_t r1)
+{
+    ctl ^= ((r1 >> 31) & 1);
+    if (ctl) {
+        int taps[] = {0,3,5,9,10,11,12,17,18,28,33,34,35,36,37,39,42,43,44,46,47,49,50,57,60,61,62,63};
+        uint64_t fb = 0;
+        for(int i=0;i<sizeof(taps)/sizeof(int);i++) fb ^= (r1>>taps[i])&1ULL;
+        r1 = (r1<<1)&0xFFFFFFFFFFFFFFFFULL;
+        if(fb&1ULL) r1 ^= 1ULL;
+    }
+    return r1;
+}
+
+static uint64_t clock_r2(int ctl, uint64_t r2)
+{
+    ctl ^= ((r2 >> 31) & 1);
+    if (ctl) {
+        int taps[] = {0,3,5,8,9,10,12,13,15,17,19,20,21,22,24,27,30,31,33,34,35,36,37,40,41,42,51,52,55,56,59,60,62,63};
+        uint64_t fb = 0;
+        for(int i=0;i<sizeof(taps)/sizeof(int);i++) fb ^= (r2>>taps[i])&1ULL;
+        r2 = (r2<<1)&0xFFFFFFFFFFFFFFFFULL;
+        if(fb&1ULL) r2 ^= 1ULL;
+    }
+    return r2;
+}
+
+static uint64_t clock_r3(int ctl, uint64_t r3)
+{
+    ctl ^= ((r3 >> 31) & 1);
+    if (ctl) {
+        int taps[] = {1,2,4,5,6,7,8,9,10,14,15,16,17,18,22,23,25,26,27,28,29,31,32,34,35,36,38,41,42,43,44,45,47,48,49,50,51,54,55,59,61,63};
+        uint64_t fb = 0;
+        for(int i=0;i<sizeof(taps)/sizeof(int);i++) fb ^= (r3>>taps[i])&1ULL;
+        r3 = (r3<<1)&0xFFFFFFFFFFFFFFFFULL;
+        if(fb&1ULL) r3 ^= 1ULL;
+    }
+    return r3;
+}
+
+void keystream37(unsigned char *key, uint64_t frame, unsigned char *output)
+{
+    uint64_t r1=0,r2=0,r3=0;
+    for(int i=0;i<8;i++) r1=(r1<<8)|key[i];
+    for(int i=0;i<8;i++) r2=(r2<<8)|key[i+8];
+    for(int i=0;i<8;i++) r3=(r3<<8)|key[i+16];
+
+    for(int i=0;i<64;i++){
+        int ctl=threshold(r1,r2,r3);
+        r1=clock_r1(ctl,r1);
+        r2=clock_r2(ctl,r2);
+        r3=clock_r3(ctl,r3);
+        if(frame&1ULL){ r1^=1ULL; r2^=1ULL; r3^=1ULL;}
+        frame>>=1;
+    }
+
+    for(int i=0;i<384;i++){
+        int ctl=threshold(r1,r2,r3);
+        r1=clock_r1(ctl,r1);
+        r2=clock_r2(ctl,r2);
+        r3=clock_r3(ctl,r3);
+    }
+
+    unsigned char *ptr=output;
+    unsigned char byte=0;
+    int bits=0;
+    for(int i=0;i<1008;i++){
+        int ctl=threshold(r1,r2,r3);
+        r1=clock_r1(ctl,r1);
+        r2=clock_r2(ctl,r2);
+        r3=clock_r3(ctl,r3);
+        int bit=((r1>>63)^(r2>>63)^(r3>>63))&1U;
+        byte=(byte<<1)|bit;
+        bits++;
+        if(bits==8){*ptr++=byte; bits=0; byte=0;}
+    }
+    if(bits) *ptr=byte;
+
+}
+
+//dsd-fme -fs -Z -i '/SSD_STORAGE/2025_DEV/Tytera BP EP AP Master Folder/kirisun/cap-clear.wav/cap-33.wav' -H '3333333333333333 3333333333333333 3333333333333333 3333333333333333'
+void kirisun_uni_keystream_creation(dsd_state *state)
+{
+  uint8_t slot = 0;
+  if (state->currentslot == 0)
+    slot = 0;
+  else slot = 1;
+
+  uint32_t lfsr = 0;
+  if (state->currentslot == 0)
+    lfsr = (uint32_t)state->payload_mi;
+  else lfsr = (uint32_t)state->payload_miR;
+
+  unsigned char userkeyhexa[32]; memset(userkeyhexa, 0, sizeof(userkeyhexa));
+  unsigned char realkey[32]; memset(realkey, 0, sizeof(realkey));
+  unsigned char lfsrhexa[4]; memset(lfsrhexa, 0, sizeof(lfsrhexa));
+  uint8_t ks_bytes[126]; memset(ks_bytes, 0, sizeof(ks_bytes));
+
+  lfsrhexa[0] = (lfsr >> 24) & 0xFF;
+  lfsrhexa[1] = (lfsr >> 16) & 0xFF;
+  lfsrhexa[2] = (lfsr >> 8)  & 0xFF;
+  lfsrhexa[3] = (lfsr >> 0)  & 0xFF;
+
+  uint64_t K1 = state->A1[slot];
+  uint64_t K2 = state->A2[slot];
+  uint64_t K3 = state->A3[slot];
+  uint64_t K4 = state->A4[slot];
+
+  if (K1 != 0 && K2 != 0 && K3 != 0 && K4 != 0)
+    state->aes_key_loaded[slot] = 1;
+  else state->aes_key_loaded[slot] = 0;
+
+  if (state->aes_key_loaded[slot] == 1)
+  {
+
+    u64_to_bytes_be(K1, &userkeyhexa[0]);
+    u64_to_bytes_be(K2, &userkeyhexa[8]);
+    u64_to_bytes_be(K3, &userkeyhexa[16]);
+    u64_to_bytes_be(K4, &userkeyhexa[24]);
+
+    for(int i=0;i<32;i++) realkey[i]=userkeyhexa[i];
+
+    /* --- MD2II first pass --- */
+    n1global=32;
+    unsigned char h4[n1]; memset(h4, 0, sizeof(h4));
+    MD2II_init();
+    MD2II_hashing(realkey,32);
+    MD2II_end(h4);
+    for(int i=0;i<32;i++) realkey[i]=h4[i];
+
+    // printf("=== realkey final (32 bytes) ===\n");
+    // print_hex(realkey,32);
+
+    /* --- MD2II with n1global=8, hash lfsr byte by byte --- */
+    unsigned char hashtag[1];
+
+    n1global=8;
+    MD2II_init();
+    for(int i=0;i<4;i++)
+    {
+      hashtag[0] = (lfsr >> (24-8*i)) & 0xFF;
+      MD2II_hashing(hashtag,1);
+    }
+    MD2II_hashing(realkey,32);
+    MD2II_end(h4);
+
+    // printf("h4[0..7]: ");
+    // print_hex(h4,8);
+
+    uint64_t internal_state=0;
+    for(int i=0;i<8;i++)
+      internal_state=(internal_state<<8)+(h4[i]);
+
+    // printf("internal_state=%016llX\n",(unsigned long long)internal_state);
+
+    /* --- MD2II with n1global=24 --- */
+    n1global=24;
+    MD2II_init();
+    for(int i=0;i<4;i++)
+    {
+      hashtag[0] = (lfsr >> (24-8*i)) & 0xFF;
+      MD2II_hashing(hashtag,1);
+    }
+    MD2II_hashing(realkey,32);
+    MD2II_end(h4);
+
+    // printf("realkey (24 bytes):\n");
+    // print_hex(h4,24);
+
+    /* --- keystream output --- */
+    unsigned char output[126]; memset(output, 0, sizeof(output));
+    keystream37(h4, internal_state, output);
+
+    // printf("keystream output (126 bytes):\n");
+    // print_hex(output,126);
+
+    //store ks_bytes to storage
+    for (int i = 0; i < 126; i++)
+      ks_bytes[i] = (uint8_t)output[i];
+
+    if (slot == 0)
+      memcpy(state->ks_octetL, ks_bytes, sizeof(ks_bytes));
+    else memcpy(state->ks_octetR, ks_bytes, sizeof(ks_bytes));
+
+    //debug ks_bytes
+    // fprintf (stderr, "KS: ");
+    // for (int i = 0; i < 126; i++)
+    // {
+    //   if ((i != 0) && ((i%16)==0))
+    //     fprintf (stderr, "\n    ");
+    //   fprintf (stderr, "%02X ", ks_bytes[i]);
+    // }
+    // fprintf (stderr, "\n");
+
+  }
+
+}
+
+//dsd-fme -fs -Z -i '/SSD_STORAGE/2025_DEV/Tytera BP EP AP Master Folder/kirisun/better_samples_tg1/kirisun_advanced_tg1.wav' -H 'DC1A7E9F9BF312DB F45010CEC5F7A53A C407D0BFA803617B E426A7254DA9390D'
+void kirisun_adv_keystream_creation(dsd_state *state)
+{
+
+  uint8_t slot = 0;
+  if (state->currentslot == 0)
+    slot = 0;
+  else slot = 1;
+
+  uint32_t lfsr = 0;
+  if (state->currentslot == 0)
+    lfsr = (uint32_t)state->payload_mi;
+  else lfsr = (uint32_t)state->payload_miR;
+  
+  unsigned char userkeyhexa[32]; memset(userkeyhexa, 0, sizeof(userkeyhexa));
+  unsigned char realkey[32]; memset(realkey, 0, sizeof(realkey));
+  unsigned char lfsrhexa[4]; memset(lfsrhexa, 0, sizeof(lfsrhexa));
+  uint8_t ks_bytes[126]; memset(ks_bytes, 0, sizeof(ks_bytes));
+
+  lfsrhexa[0] = (lfsr >> 24) & 0xFF;
+  lfsrhexa[1] = (lfsr >> 16) & 0xFF;
+  lfsrhexa[2] = (lfsr >> 8)  & 0xFF;
+  lfsrhexa[3] = (lfsr >> 0)  & 0xFF;
+
+  uint64_t K1 = state->A1[slot];
+  uint64_t K2 = state->A2[slot];
+  uint64_t K3 = state->A3[slot];
+  uint64_t K4 = state->A4[slot];
+
+  if (K1 != 0 && K2 != 0 && K3 != 0 && K4 != 0)
+    state->aes_key_loaded[slot] = 1;
+  else state->aes_key_loaded[slot] = 0;
+
+  if (state->aes_key_loaded[slot] == 1)
+  {
+
+    u64_to_bytes_be(K1, &userkeyhexa[0]);
+    u64_to_bytes_be(K2, &userkeyhexa[8]);
+    u64_to_bytes_be(K3, &userkeyhexa[16]);
+    u64_to_bytes_be(K4, &userkeyhexa[24]);
+
+    //init vital portions of PC4Context
+    ctx.x1 = 0;
+    ctx.x2 = 0;
+    for (ctx.i = 0; ctx.i < n1; ctx.i++) ctx.h2[ctx.i] = 0;
+    for (ctx.i = 0; ctx.i < n1; ctx.i++) ctx.h1[ctx.i] = 0;
+    ctx.rounds = nbround;
+
+    //create keys
+    create_keys(&ctx, userkeyhexa, 32);
+
+    /* --- MD2II first pass --- */
+    n1global=32;
+    unsigned char h4[n1]; memset(h4, 0, sizeof(h4));
+    MD2II_init();
+    MD2II_hashing(userkeyhexa,32);
+    MD2II_end(h4);
+    for(int i=0;i<32;i++) realkey[i]=h4[i];
+
+    // printf("=== realkey final (32 bytes) ===\n");
+    // print_hex(realkey,32);
+
+    n1global=32;
+    memset(h4, 0, sizeof(h4));
+    MD2II_init();
+    MD2II_hashing(lfsrhexa,4);
+    MD2II_hashing(realkey,32);
+    MD2II_end(h4);
+
+    // printf("h4[0..7]: ");
+    // print_hex(h4,8);
+
+    uint64_t internal_state=0;
+    for(int i=0;i<6;i++)
+      internal_state=(internal_state<<8)+(h4[i]);
+    
+    int k = 0;
+    for (int i = 0; i < 18; i++)
+    {
+
+      //debug internal_state
+      // fprintf (stderr, "ST: %012lX; \n", internal_state);
+
+      ctx.convert[0]=(internal_state>>40)&0xff;
+      ctx.convert[1]=(internal_state>>32)&0xff;
+      ctx.convert[2]=(internal_state>>24)&0xff;
+      ctx.convert[3]=(internal_state>>16)&0xff;
+      ctx.convert[4]=(internal_state>>8)&0xff;
+      ctx.convert[5]=internal_state&0xff;
+
+      pc4encrypt(&ctx);
+
+      internal_state=0;
+      for (int i=0;i<6;i++)
+        internal_state=(internal_state<<8)+(ctx.convert[i]&0xff);
+
+      internal_state=rol48(internal_state,1);
+
+      //keystream
+      for (int i=0;i<6;i++)
+        ks_bytes[k++] = ctx.convert[i];
+      k++; //skip 7th octet
+
+    }
+
+    //store ks_bytes to storage
+    if (slot == 0)
+      memcpy(state->ks_octetL, ks_bytes, sizeof(ks_bytes));
+    else memcpy(state->ks_octetR, ks_bytes, sizeof(ks_bytes));
+
+    //debug ks_bytes
+    // fprintf (stderr, "KS: ");
+    // for (int i = 0; i < 126; i++)
+    // {
+    //   if ((i != 0) && ((i%16)==0))
+    //     fprintf (stderr, "\n    ");
+    //   fprintf (stderr, "%02X ", ks_bytes[i]);
+    // }
+    // fprintf (stderr, "\n");
+
+  }
+
+}
--- a/src/crypt-pc4.c
+++ b/src/crypt-pc4.c
@@ -0,0 +1,392 @@
+#include "pc4.h"
+
+/* Global PC4 context instance */
+PC4Context ctx;
+
+/* ---------------------------------
+   Internal utility functions
+----------------------------------- */
+
+/* Rotate right */
+static uint32_t ror(uint32_t x, int shift, int bits) {
+    uint32_t m0 = (1u << (bits - shift)) - 1u;
+    uint32_t m1 = (1u << shift) - 1u;
+    return ((x >> shift) & m0) | ((x & m1) << (bits - shift));
+}
+
+/* Rotate left */
+static uint32_t rol(uint32_t x, int shift, int bits) {
+    uint32_t m0 = (1u << (bits - shift)) - 1u;
+    uint32_t m1 = (1u << shift) - 1u;
+    return ((x & m0) << shift) | ((x >> (bits - shift)) & m1);
+}
+
+/* SplitMix64 random number generator */
+static uint64_t next_rng(PC4Context *ctx) {
+    uint64_t z = (ctx->x += 0x9e3779b97f4a7c15ULL);
+    z = (z ^ (z >> 30)) * 0xbf58476d1ce4e5b9ULL;
+    z = (z ^ (z >> 27)) * 0x94d049bb133111ebULL;
+    return z ^ (z >> 31);
+}
+
+/* ARC4 initialization */
+static void arc4_init(PC4Context *ctx, unsigned char key[]) {
+    int tmp;
+    for (ctx->i_arc4 = 0; ctx->i_arc4 < 256; ctx->i_arc4++)
+        ctx->array_arc4[ctx->i_arc4] = (unsigned char)ctx->i_arc4;
+
+    ctx->j_arc4 = 0;
+    for (ctx->i_arc4 = 0; ctx->i_arc4 < 256; ctx->i_arc4++) {
+        ctx->j_arc4 = (ctx->j_arc4 + ctx->array_arc4[ctx->i_arc4] + key[ctx->i_arc4 % 256]) % 256;
+        tmp = ctx->array_arc4[ctx->i_arc4];
+        ctx->array_arc4[ctx->i_arc4] = ctx->array_arc4[ctx->j_arc4];
+        ctx->array_arc4[ctx->j_arc4] = tmp;
+    }
+    ctx->i_arc4 = 0;
+    ctx->j_arc4 = 0;
+}
+
+/* ARC4 output combined with SplitMix64 stream */
+static unsigned char arc4_output(PC4Context *ctx) {
+    uint8_t rndbyte, decal;
+    int tmp, t;
+
+    ctx->i_arc4 = (ctx->i_arc4 + 1) % 256;
+    ctx->j_arc4 = (ctx->j_arc4 + ctx->array_arc4[ctx->i_arc4]) % 256;
+    tmp = ctx->array_arc4[ctx->i_arc4];
+    ctx->array_arc4[ctx->i_arc4] = ctx->array_arc4[ctx->j_arc4];
+    ctx->array_arc4[ctx->j_arc4] = tmp;
+    t = (ctx->array_arc4[ctx->i_arc4] + ctx->array_arc4[ctx->j_arc4]) % 256;
+
+    if (ctx->xyz == 0) ctx->bb = next_rng(ctx);
+    decal = (uint8_t)(56 - (8 * ctx->xyz));
+    rndbyte = (uint8_t)((ctx->bb >> decal) & 0xffu);
+    ctx->xyz++;
+    if (ctx->xyz == 8) ctx->xyz = 0;
+
+    if (ctx->count == 0) {
+        rndbyte = (uint8_t)(rndbyte ^ ctx->array_arc4[t]);
+        ctx->count = 1;
+    } else {
+        rndbyte = (uint8_t)(rndbyte + ctx->array_arc4[t]);
+        ctx->count = 0;
+    }
+    return rndbyte;
+}
+
+/* Initialize MD2-II state */
+static void md2_init(PC4Context *ctx) {
+    ctx->x1 = 0;
+    ctx->x2 = 0;
+    for (ctx->i = 0; ctx->i < n1; ctx->i++) ctx->h2[ctx->i] = 0;
+    for (ctx->i = 0; ctx->i < n1; ctx->i++) ctx->h1[ctx->i] = 0;
+}
+
+/* MD2-II hashing */
+static void md2_hashing(PC4Context *ctx, unsigned char t1[], size_t b6) {
+    static const unsigned char s4[256] = {
+        13,199,11,67,237,193,164,77,115,184,141,222,73,38,147,36,150,87,21,104,12,61,156,101,111,145,
+        119,22,207,35,198,37,171,167,80,30,219,28,213,121,86,29,214,242,6,4,89,162,110,175,19,157,3,
+        88,234,94,144,118,159,239,100,17,182,173,238,68,16,79,132,54,163,52,9,58,57,55,229,192,170,226,
+        56,231,187,158,70,224,233,245,26,47,32,44,247,8,251,20,197,185,109,153,204,218,93,178,212,137,84,
+        174,24,120,130,149,72,180,181,208,255,189,152,18,143,176,60,249,27,227,128,139,243,253,59,123,172,
+        108,211,96,138,10,215,42,225,40,81,65,90,25,98,126,154,64,124,116,122,5,1,168,83,190,131,191,244,
+        240,235,177,155,228,125,66,43,201,248,220,129,188,230,62,75,71,78,34,31,216,254,136,91,114,106,46,
+        217,196,92,151,209,133,51,236,33,252,127,179,69,7,183,105,146,97,39,15,205,112,200,166,223,45,48,
+        246,186,41,148,140,107,76,85,95,194,142,50,49,134,23,135,169,221,210,203,63,165,82,161,202,53,14,
+        206,232,103,102,195,117,250,99,0,74,160,241,2,113};
+
+    int b1, b2, b3, b4, b5;
+    b4 = 0;
+    while (b6) {
+        for (; b6 && ctx->x2 < n1; b6--, ctx->x2++) {
+            b5 = t1[b4++];
+            ctx->h1[ctx->x2 + n1] = (unsigned char)b5;
+            ctx->h1[ctx->x2 + (n1 * 2)] = (unsigned char)(b5 ^ ctx->h1[ctx->x2]);
+            ctx->x1 = ctx->h2[ctx->x2] ^= s4[b5 ^ ctx->x1];
+        }
+        if (ctx->x2 == n1) {
+            b2 = 0;
+            ctx->x2 = 0;
+            for (b3 = 0; b3 < (n1 + 2); b3++) {
+                for (b1 = 0; b1 < (n1 * 3); b1++)
+                    b2 = ctx->h1[b1] ^= s4[b2];
+                b2 = (b2 + b3) % 256;
+            }
+        }
+    }
+}
+
+/* Finalize MD2-II */
+static void md2_end(PC4Context *ctx, unsigned char h4[n1]) {
+    unsigned char h3[n1];
+    int i, n4 = n1 - ctx->x2;
+    for (i = 0; i < n4; i++) h3[i] = (unsigned char)n4;
+    md2_hashing(ctx, h3, (size_t)n4);
+    md2_hashing(ctx, ctx->h2, sizeof(ctx->h2));
+    for (i = 0; i < n1; i++) h4[i] = ctx->h1[i];
+}
+
+/* Generate a random index */
+static int mixy(PC4Context *ctx, int nn2) {
+    return arc4_output(ctx) % nn2;
+}
+
+/* Fisher-Yates shuffle */
+static void mixer(PC4Context *ctx, uint8_t *mixu, int nn) {
+    int ii, jj, tmmp;
+    for (ii = nn - 1; ii > 0; ii--) {
+        jj = mixy(ctx, ii + 1);
+        tmmp = mixu[jj];
+        mixu[jj] = mixu[ii];
+        mixu[ii] = (uint8_t)tmmp;
+    }
+}
+
+/* Key schedule and S-box generation */
+void create_keys(PC4Context *ctx, unsigned char key1[], size_t size1) {
+    int i, w, k;
+    unsigned char h4[n1];
+
+    md2_init(ctx);
+    md2_hashing(ctx, key1, size1);
+    md2_end(ctx, h4);
+
+    for (i = 0; i < 16; i++) ctx->keys[i] = h4[i];
+    arc4_init(ctx, h4);
+
+    ctx->x = 0;
+    for (i = 0; i < 8; i++) ctx->x = (ctx->x << 8) + (uint64_t)(h4[256 + i] & 0xffu);
+
+    ctx->xyz = 0;
+    ctx->count = 0;
+
+    for (i = 0; i < 20000; i++) (void)arc4_output(ctx);
+
+    uint8_t numbers[256];
+
+    for (w = 0; w < 16; w++) {
+        k = arc4_output(ctx) + 256;
+        for (i = 0; i < k; i++) (void)arc4_output(ctx);
+        for (i = 0; i < 256; i++) numbers[i] = (uint8_t)i;
+        mixer(ctx, numbers, 256);
+        for (i = 0; i < 256; i++) ctx->perm[w][i] = numbers[i];
+    }
+
+    k = arc4_output(ctx) + 256;
+    for (i = 0; i < k; i++) (void)arc4_output(ctx);
+    for (i = 0; i < 256; i++) numbers[i] = (uint8_t)i;
+    mixer(ctx, numbers, 256);
+    for (i = 0; i < 256; i++) ctx->new1[i] = numbers[i];
+
+    k = arc4_output(ctx) + 256;
+    for (i = 0; i < k; i++) (void)arc4_output(ctx);
+    for (i = 0; i < 49; i++) numbers[i] = (uint8_t)i;
+    mixer(ctx, numbers, 49);
+    for (i = 0; i < 49; i++) ctx->array[i] = numbers[i];
+
+    k = arc4_output(ctx) + 256;
+    for (i = 0; i < k; i++) (void)arc4_output(ctx);
+    for (i = 0; i < nbround; i++) ctx->decal[i] = (uint8_t)((arc4_output(ctx) % 23) + 1);
+
+    k = arc4_output(ctx) + 256;
+    for (i = 0; i < k; i++) (void)arc4_output(ctx);
+    for (w = 0; w < 3; w++)
+        for (i = 0; i < nbround; i++)
+            ctx->rngxor[i][w] = arc4_output(ctx);
+
+    k = arc4_output(ctx) + 256;
+    for (i = 0; i < k; i++) (void)arc4_output(ctx);
+    for (i = 0; i < 49; i++) numbers[i] = (uint8_t)i;
+    mixer(ctx, numbers, 49);
+    for (i = 0; i < 49; i++) ctx->array2[i] = numbers[i];
+
+    k = arc4_output(ctx) + 256;
+    for (i = 0; i < k; i++) (void)arc4_output(ctx);
+    for (i = 0; i < 256; i++) numbers[i] = (uint8_t)i;
+    mixer(ctx, numbers, 256);
+    for (i = 0; i < 256; i++) {
+        ctx->tab[i] = numbers[i];
+        ctx->inv[ctx->tab[i]] = (unsigned char)i;
+    }
+
+    k = arc4_output(ctx) + 256;
+    for (i = 0; i < k; i++) (void)arc4_output(ctx);
+    for (w = 0; w < 3; w++) {
+        k = arc4_output(ctx) + 256;
+        for (i = 0; i < k; i++) (void)arc4_output(ctx);
+        for (i = 0; i < 3; i++) numbers[i] = (uint8_t)i;
+        mixer(ctx, numbers, 3);
+        for (i = 0; i < 3; i++) ctx->permut[w][i] = numbers[i];
+    }
+
+    k = arc4_output(ctx) + 256;
+    for (i = 0; i < k; i++) (void)arc4_output(ctx);
+    for (w = 0; w < 3; w++)
+        for (i = 0; i < nbround; i++)
+            ctx->rngxor2[i][w] = arc4_output(ctx);
+}
+
+/* Compute round transformation */
+static void compute(PC4Context *ctx, uint8_t *tab1, uint8_t round) {
+    ctx->tot[0] = (uint8_t)((ctx->perm[round][tab1[ctx->permut[0][0]]] +
+                             ctx->perm[round][tab1[ctx->permut[0][1]]]) ^
+                            ctx->perm[round][tab1[ctx->permut[0][2]]]);
+    ctx->tot[0] = (uint8_t)(ctx->tot[0] + ctx->new1[ctx->tot[0]]);
+    ctx->tot[1] = (uint8_t)((ctx->perm[round][tab1[ctx->permut[1][0]]] +
+                             ctx->perm[round][tab1[ctx->permut[1][1]]]) ^
+                            ctx->perm[round][tab1[ctx->permut[1][2]]]);
+    ctx->tot[1] = (uint8_t)(ctx->tot[1] + ctx->new1[ctx->tot[1]]);
+    ctx->tot[2] = (uint8_t)((ctx->perm[round][tab1[ctx->permut[2][0]]] +
+                             ctx->perm[round][tab1[ctx->permut[2][1]]]) ^
+                            ctx->perm[round][tab1[ctx->permut[2][2]]]);
+    ctx->tot[2] = (uint8_t)(ctx->tot[2] + ctx->new1[ctx->tot[2]]);
+}
+
+/* Convert bits to bytes */
+void binhex(PC4Context *ctx, short *z, int length) {
+    short *b = (short *)z;
+    uint8_t i, j;
+    for (i = 0; i < length; i = j) {
+        uint8_t a = 0;
+        for (j = i; j < i + 8; ++j) {
+            a |= (uint8_t)(b[((short)(7 - (j % 8)) + j) - (j % 8)] << (j - i));
+        }
+        ctx->convert[ctx->ptconvert] = a;
+        ctx->ptconvert++;
+    }
+}
+
+/* Convert byte to bits */
+void hexbin(PC4Context *ctx, short *q, uint8_t w, uint8_t hex) { // warning: unused parameter ‘ctx’ [-Wunused-parameter]
+    short *bits = (short *)q;
+    for (uint8_t i = 0; i < 8; ++i) {
+        bits[(short)(7 + w) - i] = (short)((hex >> i) & 1u);
+    }
+
+    UNUSEDPC4(ctx); //fix above warning
+}
+
+/* Encrypt one block */
+void pc4encrypt(PC4Context *ctx) {
+    int i;
+    ctx->totb = 0;
+
+    for (i = 0; i < 3; i++) {
+        ctx->l[0][i] = ctx->convert[i];
+        ctx->r[0][i] = ctx->convert[i + 3];
+    }
+
+    for (i = 1; i <= ctx->rounds; i++) {
+        ctx->totb ^= ctx->r[(i - 1) % 2][0];
+        ctx->totb ^= ctx->r[(i - 1) % 2][1];
+        ctx->totb ^= ctx->r[(i - 1) % 2][2];
+
+        ctx->r[(i - 1) % 2][0] += (uint8_t)(~ctx->rngxor2[ctx->rounds - i][0]);
+        ctx->r[(i - 1) % 2][1] ^= (uint8_t)(~ctx->rngxor2[ctx->rounds - i][1]);
+        ctx->r[(i - 1) % 2][2] += (uint8_t)(~ctx->rngxor2[ctx->rounds - i][2]);
+
+        ctx->result = 0;
+        ctx->result += ((uint32_t)ctx->r[(i - 1) % 2][0] << 16);
+        ctx->result += ((uint32_t)ctx->r[(i - 1) % 2][1] << 8);
+        ctx->result += ctx->r[(i - 1) % 2][2];
+
+        ctx->result = rol(ctx->result, ctx->decal[i - 1], 24);
+
+        ctx->r[(i - 1) % 2][0] = (uint8_t)(ctx->result >> 16);
+        ctx->r[(i - 1) % 2][1] = (uint8_t)((ctx->result >> 8) & 0xffu);
+        ctx->r[(i - 1) % 2][2] = (uint8_t)(ctx->result & 0xffu);
+
+        ctx->r[(i - 1) % 2][0] = ctx->tab[ctx->r[(i - 1) % 2][0]];
+        ctx->r[(i - 1) % 2][0] ^= ctx->rngxor[i - 1][0];
+
+        ctx->r[(i - 1) % 2][1] = ctx->inv[ctx->r[(i - 1) % 2][1]];
+        ctx->r[(i - 1) % 2][1] -= ctx->rngxor[i - 1][1];
+
+        ctx->r[(i - 1) % 2][2] = ctx->tab[ctx->r[(i - 1) % 2][2]];
+        ctx->r[(i - 1) % 2][2] ^= ctx->rngxor[i - 1][2];
+
+        compute(ctx, ctx->r[(i - 1) % 2], (uint8_t)((i - 1) % 16));
+
+        ctx->l[i % 2][0] = ctx->r[(i - 1) % 2][0];
+        ctx->r[i % 2][0] = ctx->l[(i - 1) % 2][0] - ctx->tot[0];
+
+        ctx->l[i % 2][1] = ctx->r[(i - 1) % 2][1];
+        ctx->r[i % 2][1] = ctx->l[(i - 1) % 2][1] ^ ctx->tot[1];
+
+        ctx->l[i % 2][2] = ctx->r[(i - 1) % 2][2];
+        ctx->r[i % 2][2] = ctx->l[(i - 1) % 2][2] - ctx->tot[2];
+    }
+
+    for (i = 0; i < 3; i++) {
+        ctx->convert[i + 3] = ctx->l[(ctx->rounds - 1) % 2][i];
+        ctx->convert[i] = ctx->r[(ctx->rounds - 1) % 2][i];
+    }
+
+    ctx->totb %= 2;
+}
+
+/* Decrypt one block */
+void pc4decrypt(PC4Context *ctx) {
+    int i;
+    ctx->totb = 0;
+
+    for (i = 0; i < 3; i++) {
+        ctx->l[0][i] = ctx->convert[i];
+        ctx->r[0][i] = ctx->convert[i + 3];
+    }
+
+    ctx->y = (uint8_t)((ctx->rounds - 1) % 16);
+    if (ctx->y == 0) ctx->y = 16;
+
+    for (i = 1; i <= ctx->rounds; i++) {
+        ctx->y--;
+        compute(ctx, ctx->r[(i - 1) % 2], ctx->y);
+        if (ctx->y == 0) ctx->y = 16;
+
+        ctx->result = 0;
+
+        ctx->l[(i - 1) % 2][0] ^= ctx->rngxor[ctx->rounds - i][0];
+        ctx->l[(i - 1) % 2][0] = ctx->inv[ctx->l[(i - 1) % 2][0]];
+
+        ctx->l[(i - 1) % 2][1] += ctx->rngxor[ctx->rounds - i][1];
+        ctx->l[(i - 1) % 2][1] = ctx->tab[ctx->l[(i - 1) % 2][1]];
+
+        ctx->l[(i - 1) % 2][2] ^= ctx->rngxor[ctx->rounds - i][2];
+        ctx->l[(i - 1) % 2][2] = ctx->inv[ctx->l[(i - 1) % 2][2]];
+
+        ctx->result += ((uint32_t)ctx->l[(i - 1) % 2][0] << 16);
+        ctx->result += ((uint32_t)ctx->l[(i - 1) % 2][1] << 8);
+        ctx->result += ctx->l[(i - 1) % 2][2];
+
+        ctx->result = ror(ctx->result, ctx->decal[ctx->rounds - i], 24);
+
+        ctx->l[(i - 1) % 2][0] = (uint8_t)(ctx->result >> 16);
+        ctx->l[(i - 1) % 2][1] = (uint8_t)((ctx->result >> 8) & 0xffu);
+        ctx->l[(i - 1) % 2][2] = (uint8_t)(ctx->result & 0xffu);
+
+        ctx->l[(i - 1) % 2][0] -= (uint8_t)(~ctx->rngxor2[i - 1][0]);
+        ctx->l[(i - 1) % 2][1] ^= (uint8_t)(~ctx->rngxor2[i - 1][1]);
+        ctx->l[(i - 1) % 2][2] -= (uint8_t)(~ctx->rngxor2[i - 1][2]);
+
+        ctx->totb ^= ctx->l[(i - 1) % 2][0];
+        ctx->totb ^= ctx->l[(i - 1) % 2][1];
+        ctx->totb ^= ctx->l[(i - 1) % 2][2];
+
+        ctx->l[i % 2][0] = ctx->r[(i - 1) % 2][0];
+        ctx->r[i % 2][0] = ctx->l[(i - 1) % 2][0] + ctx->tot[0];
+
+        ctx->l[i % 2][1] = ctx->r[(i - 1) % 2][1];
+        ctx->r[i % 2][1] = ctx->l[(i - 1) % 2][1] ^ ctx->tot[1];
+
+        ctx->l[i % 2][2] = ctx->r[(i - 1) % 2][2];
+        ctx->r[i % 2][2] = ctx->l[(i - 1) % 2][2] + ctx->tot[2];
+    }
+
+    for (i = 0; i < 3; i++) {
+        ctx->convert[i + 3] = ctx->l[(ctx->rounds - 1) % 2][i];
+        ctx->convert[i] = ctx->r[(ctx->rounds - 1) % 2][i];
+    }
+
+    ctx->totb %= 2;
+}
--- a/src/crypt-pc5.c
+++ b/src/crypt-pc5.c
@@ -0,0 +1,468 @@
+#include "pc5.h"
+#include "dsd.h"
+
+#include <ctype.h>
+
+/* Global PC5 context instance */
+PC5Context ctxpc5;
+
+/* ---------------------------------
+   Internal utility functions
+----------------------------------- */
+
+/* Rotate right */
+static uint32_t ror(uint32_t x, int shift, int bits) {
+    uint32_t m0 = (1u << (bits - shift)) - 1u;
+    uint32_t m1 = (1u << shift) - 1u;
+    return ((x >> shift) & m0) | ((x & m1) << (bits - shift));
+}
+
+/* Rotate left */
+static uint32_t rol(uint32_t x, int shift, int bits) {
+    uint32_t m0 = (1u << (bits - shift)) - 1u;
+    uint32_t m1 = (1u << shift) - 1u;
+    return ((x & m0) << shift) | ((x >> (bits - shift)) & m1);
+}
+
+/* SplitMix64 random number generator */
+static uint64_t next_rng(PC5Context *ctxpc5) {
+    uint64_t z = (ctxpc5->x += 0x9e3779b97f4a7c15ULL);
+    z = (z ^ (z >> 30)) * 0xbf58476d1ce4e5b9ULL;
+    z = (z ^ (z >> 27)) * 0x94d049bb133111ebULL;
+    return z ^ (z >> 31);
+}
+
+/* ARC4 initialization */
+static void arc4_init(PC5Context *ctxpc5, unsigned char key[]) {
+    int tmp;
+    for (ctxpc5->i_arc4 = 0; ctxpc5->i_arc4 < 256; ctxpc5->i_arc4++)
+        ctxpc5->array_arc4[ctxpc5->i_arc4] = (unsigned char)ctxpc5->i_arc4;
+
+    ctxpc5->j_arc4 = 0;
+    for (ctxpc5->i_arc4 = 0; ctxpc5->i_arc4 < 256; ctxpc5->i_arc4++) {
+        ctxpc5->j_arc4 = (ctxpc5->j_arc4 + ctxpc5->array_arc4[ctxpc5->i_arc4] + key[ctxpc5->i_arc4 % 256]) % 256;
+        tmp = ctxpc5->array_arc4[ctxpc5->i_arc4];
+        ctxpc5->array_arc4[ctxpc5->i_arc4] = ctxpc5->array_arc4[ctxpc5->j_arc4];
+        ctxpc5->array_arc4[ctxpc5->j_arc4] = tmp;
+    }
+    ctxpc5->i_arc4 = 0;
+    ctxpc5->j_arc4 = 0;
+}
+
+/* ARC4 output combined with SplitMix64 stream */
+static unsigned char arc4_output(PC5Context *ctxpc5) {
+    uint8_t rndbyte, decal;
+    int tmp, t;
+
+    ctxpc5->i_arc4 = (ctxpc5->i_arc4 + 1) % 256;
+    ctxpc5->j_arc4 = (ctxpc5->j_arc4 + ctxpc5->array_arc4[ctxpc5->i_arc4]) % 256;
+    tmp = ctxpc5->array_arc4[ctxpc5->i_arc4];
+    ctxpc5->array_arc4[ctxpc5->i_arc4] = ctxpc5->array_arc4[ctxpc5->j_arc4];
+    ctxpc5->array_arc4[ctxpc5->j_arc4] = tmp;
+    t = (ctxpc5->array_arc4[ctxpc5->i_arc4] + ctxpc5->array_arc4[ctxpc5->j_arc4]) % 256;
+
+    if (ctxpc5->xyz == 0) ctxpc5->bb = next_rng(ctxpc5);
+    decal = (uint8_t)(56 - (8 * ctxpc5->xyz));
+    rndbyte = (uint8_t)((ctxpc5->bb >> decal) & 0xffu);
+    ctxpc5->xyz++;
+    if (ctxpc5->xyz == 8) ctxpc5->xyz = 0;
+
+    if (ctxpc5->count == 0) {
+        rndbyte = (uint8_t)(rndbyte ^ ctxpc5->array_arc4[t]);
+        ctxpc5->count = 1;
+    } else {
+        rndbyte = (uint8_t)(rndbyte + ctxpc5->array_arc4[t]);
+        ctxpc5->count = 0;
+    }
+    return rndbyte;
+}
+
+/* Initialize MD2-II state */
+static void md2_init(PC5Context *ctxpc5) {
+    ctxpc5->x1 = 0;
+    ctxpc5->x2 = 0;
+    for (ctxpc5->i = 0; ctxpc5->i < n1; ctxpc5->i++) ctxpc5->h2[ctxpc5->i] = 0;
+    for (ctxpc5->i = 0; ctxpc5->i < n1; ctxpc5->i++) ctxpc5->h1[ctxpc5->i] = 0;
+}
+
+/* MD2-II hashing */
+static void md2_hashing(PC5Context *ctxpc5, unsigned char t1[], size_t b6) {
+    static const unsigned char s4[256] = {
+        13,199,11,67,237,193,164,77,115,184,141,222,73,38,147,36,150,87,21,104,12,61,156,101,111,145,
+        119,22,207,35,198,37,171,167,80,30,219,28,213,121,86,29,214,242,6,4,89,162,110,175,19,157,3,
+        88,234,94,144,118,159,239,100,17,182,173,238,68,16,79,132,54,163,52,9,58,57,55,229,192,170,226,
+        56,231,187,158,70,224,233,245,26,47,32,44,247,8,251,20,197,185,109,153,204,218,93,178,212,137,84,
+        174,24,120,130,149,72,180,181,208,255,189,152,18,143,176,60,249,27,227,128,139,243,253,59,123,172,
+        108,211,96,138,10,215,42,225,40,81,65,90,25,98,126,154,64,124,116,122,5,1,168,83,190,131,191,244,
+        240,235,177,155,228,125,66,43,201,248,220,129,188,230,62,75,71,78,34,31,216,254,136,91,114,106,46,
+        217,196,92,151,209,133,51,236,33,252,127,179,69,7,183,105,146,97,39,15,205,112,200,166,223,45,48,
+        246,186,41,148,140,107,76,85,95,194,142,50,49,134,23,135,169,221,210,203,63,165,82,161,202,53,14,
+        206,232,103,102,195,117,250,99,0,74,160,241,2,113};
+
+    int b1, b2, b3, b4, b5;
+    b4 = 0;
+    while (b6) {
+        for (; b6 && ctxpc5->x2 < n1; b6--, ctxpc5->x2++) {
+            b5 = t1[b4++];
+            ctxpc5->h1[ctxpc5->x2 + n1] = (unsigned char)b5;
+            ctxpc5->h1[ctxpc5->x2 + (n1 * 2)] = (unsigned char)(b5 ^ ctxpc5->h1[ctxpc5->x2]);
+            ctxpc5->x1 = ctxpc5->h2[ctxpc5->x2] ^= s4[b5 ^ ctxpc5->x1];
+        }
+        if (ctxpc5->x2 == n1) {
+            b2 = 0;
+            ctxpc5->x2 = 0;
+            for (b3 = 0; b3 < (n1 + 2); b3++) {
+                for (b1 = 0; b1 < (n1 * 3); b1++)
+                    b2 = ctxpc5->h1[b1] ^= s4[b2];
+                b2 = (b2 + b3) % 256;
+            }
+        }
+    }
+}
+
+/* Finalize MD2-II */
+static void md2_end(PC5Context *ctxpc5, unsigned char h4[n1]) {
+    unsigned char h3[n1];
+    int i, n4 = n1 - ctxpc5->x2;
+    for (i = 0; i < n4; i++) h3[i] = (unsigned char)n4;
+    md2_hashing(ctxpc5, h3, (size_t)n4);
+    md2_hashing(ctxpc5, ctxpc5->h2, sizeof(ctxpc5->h2));
+    for (i = 0; i < n1; i++) h4[i] = ctxpc5->h1[i];
+}
+
+/* Generate a random index */
+static int mixy(PC5Context *ctxpc5, int nn2) {
+    return arc4_output(ctxpc5) % nn2;
+}
+
+/* Fisher-Yates shuffle */
+static void mixer(PC5Context *ctxpc5, uint8_t *mixu, int nn) {
+    int ii, jj, tmmp;
+    for (ii = nn - 1; ii > 0; ii--) {
+        jj = mixy(ctxpc5, ii + 1);
+        tmmp = mixu[jj];
+        mixu[jj] = mixu[ii];
+        mixu[ii] = (uint8_t)tmmp;
+    }
+}
+
+/* Key schedule and S-box generation */
+void create_keys_pc5(PC5Context *ctxpc5, unsigned char key1[], size_t size1) {
+    int i, w, k;
+    unsigned char h4[n1];
+
+    md2_init(ctxpc5);
+    md2_hashing(ctxpc5, key1, size1);
+    md2_end(ctxpc5, h4);
+
+    for (i = 0; i < 16; i++) ctxpc5->keys[i] = h4[i];
+    arc4_init(ctxpc5, h4);
+
+    ctxpc5->x = 0;
+    for (i = 0; i < 8; i++) ctxpc5->x = (ctxpc5->x << 8) + (uint64_t)(h4[256 + i] & 0xffu);
+
+    ctxpc5->xyz = 0;
+    ctxpc5->count = 0;
+
+    for (i = 0; i < 23000; i++) (void)arc4_output(ctxpc5);
+
+    uint8_t numbers[256];
+    
+    for (w = 0; w < 253; w++) {
+        k = arc4_output(ctxpc5) + 256;
+        for (i = 0; i < k; i++) (void)arc4_output(ctxpc5);
+        for (i = 0; i < 16; i++) numbers[i] = (uint8_t)i;
+        mixer(ctxpc5, numbers, 16);
+        for (i = 0; i < 16; i++) ctxpc5->perm[i][w] = numbers[i];
+    }
+        
+    k = arc4_output(ctxpc5) + 256;
+    for (i = 0; i < k; i++) (void)arc4_output(ctxpc5);
+    for (i = 0; i < 16; i++) numbers[i] = (uint8_t)i;
+    mixer(ctxpc5, numbers, 16);
+    for (i = 0; i < 16; i++) ctxpc5->new1[i] = numbers[i];
+
+    k = arc4_output(ctxpc5) + 256;
+    for (i = 0; i < k; i++) (void)arc4_output(ctxpc5);
+    for (i = 0; i < nbround; i++) ctxpc5->decal[i] = (uint8_t)((arc4_output(ctxpc5) % 11) + 1);
+
+    k = arc4_output(ctxpc5) + 256;
+    for (i = 0; i < k; i++) (void)arc4_output(ctxpc5);
+    for (w = 0; w < 3; w++)
+        for (i = 0; i < nbround; i++)
+            ctxpc5->rngxor[i][w] = arc4_output(ctxpc5) % 16;
+
+    k = arc4_output(ctxpc5) + 256;
+    for (i = 0; i < k; i++) (void)arc4_output(ctxpc5);
+    for (i = 0; i < 16; i++) numbers[i] = (uint8_t)i;
+    mixer(ctxpc5, numbers, 16);
+    for (i = 0; i < 16; i++) {
+        ctxpc5->tab[i] = numbers[i];
+        ctxpc5->inv[ctxpc5->tab[i]] = (unsigned char)i;
+    }
+
+    k = arc4_output(ctxpc5) + 256;
+    for (i = 0; i < k; i++) (void)arc4_output(ctxpc5);
+    for (w = 0; w < 3; w++) {
+        k = arc4_output(ctxpc5) + 256;
+        for (i = 0; i < k; i++) (void)arc4_output(ctxpc5);
+        for (i = 0; i < 3; i++) numbers[i] = (uint8_t)i;
+        mixer(ctxpc5, numbers, 3);
+        for (i = 0; i < 3; i++) ctxpc5->permut[w][i] = numbers[i];
+    }
+    
+    
+
+    k = arc4_output(ctxpc5) + 256;
+    for (i = 0; i < k; i++) (void)arc4_output(ctxpc5);
+    for (w = 0; w < 3; w++)
+        for (i = 0; i < nbround; i++)
+            ctxpc5->rngxor2[i][w] = arc4_output(ctxpc5) % 16;
+            
+   k = arc4_output(ctxpc5) + 256;
+
+   for (w = 0; w < 25; w++) ctxpc5->numbers[w]=arc4_output(ctxpc5) % 2;
+   
+}
+
+static void compute_pc5(PC5Context *ctxpc5, uint8_t *tab1, uint8_t round) {
+    ctxpc5->tot[0] = (uint8_t)((ctxpc5->perm[tab1[ctxpc5->permut[0][0]]][round] +
+                             ctxpc5->perm[tab1[ctxpc5->permut[0][1]]][round]) ^
+                            ctxpc5->perm[tab1[ctxpc5->permut[0][2]]][round]);
+    ctxpc5->tot[0] = (uint8_t)((ctxpc5->tot[0] + ctxpc5->new1[ctxpc5->tot[0]]) % 16);
+    ctxpc5->tot[1] = (uint8_t)((ctxpc5->perm[tab1[ctxpc5->permut[1][0]]][round] +
+                             ctxpc5->perm[tab1[ctxpc5->permut[1][1]]][round]) ^
+                            ctxpc5->perm[tab1[ctxpc5->permut[1][2]]][round]);
+    ctxpc5->tot[1] = (uint8_t)((ctxpc5->tot[1] + ctxpc5->new1[ctxpc5->tot[1]]) % 16);
+    ctxpc5->tot[2] = (uint8_t)((ctxpc5->perm[tab1[ctxpc5->permut[2][0]]][round] +
+                             ctxpc5->perm[tab1[ctxpc5->permut[2][1]]][round]) ^
+                            ctxpc5->perm[tab1[ctxpc5->permut[2][2]]][round]);
+    ctxpc5->tot[2] = (uint8_t)((ctxpc5->tot[2] + ctxpc5->new1[ctxpc5->tot[2]]) % 16);
+}
+
+/* Convert bits to bytes */
+void binhexpc5(PC5Context *ctxpc5, short *z, int length) {
+    short *b = (short *)z;
+    uint8_t i, j;
+    for (i = 0; i < length; i = j) {
+        uint8_t a = 0;
+        for (j = i; j < i + 8; ++j) {
+            a |= (uint8_t)(b[((short)(7 - (j % 8)) + j) - (j % 8)] << (j - i));
+        }
+        ctxpc5->convert[ctxpc5->ptconvert] = a;
+        ctxpc5->ptconvert++;
+    }
+}
+
+/* Convert byte to bits */
+void hexbinpc5(PC5Context *ctxpc5, short *q, uint8_t w, uint8_t hex) { // warning: unused parameter ‘ctxpc5’ [-Wunused-parameter]
+    UNUSED(ctxpc5);
+    short *bits = (short *)q;
+    for (uint8_t i = 0; i < 8; ++i) {
+        bits[(short)(7 + w) - i] = (short)((hex >> i) & 1u);
+    }
+
+   // UNUSEDPC4(ctxpc5); //fix above warning
+}
+
+/* Encrypt one block */
+void pc5encrypt(PC5Context *ctxpc5) {
+    int i;
+    int g;
+
+    for (i = 0; i < 3; i++) {
+        ctxpc5->l[0][i] = ctxpc5->convert[i];
+        ctxpc5->r[0][i] = ctxpc5->convert[i + 3];
+    }
+
+    for (i = 1; i <= ctxpc5->rounds; i++) {
+        ctxpc5->r[(i - 1) % 2][0] = (ctxpc5->r[(i - 1) % 2][0] + ((uint8_t)~ctxpc5->rngxor2[ctxpc5->rounds - i][0])) % 16;
+        ctxpc5->r[(i - 1) % 2][1] = (ctxpc5->r[(i - 1) % 2][1] ^ ((uint8_t)~ctxpc5->rngxor2[ctxpc5->rounds - i][1])) % 16;
+        ctxpc5->r[(i - 1) % 2][2] = (ctxpc5->r[(i - 1) % 2][2] + ((uint8_t)~ctxpc5->rngxor2[ctxpc5->rounds - i][2])) % 16;
+
+        ctxpc5->result = 0;
+        ctxpc5->result += ((uint32_t)ctxpc5->r[(i - 1) % 2][0] << 8);
+        ctxpc5->result += ((uint32_t)ctxpc5->r[(i - 1) % 2][1] << 4);
+        ctxpc5->result += ctxpc5->r[(i - 1) % 2][2];
+
+        ctxpc5->result = rol(ctxpc5->result, ctxpc5->decal[i - 1], 12);
+
+        ctxpc5->r[(i - 1) % 2][0] = (uint8_t)(ctxpc5->result >> 8);
+        ctxpc5->r[(i - 1) % 2][1] = (uint8_t)((ctxpc5->result >> 4) & 0xfu);
+        ctxpc5->r[(i - 1) % 2][2] = (uint8_t)(ctxpc5->result & 0xfu);
+
+        ctxpc5->r[(i - 1) % 2][0] = ctxpc5->tab[ctxpc5->r[(i - 1) % 2][0]];
+        ctxpc5->r[(i - 1) % 2][0] = (ctxpc5->r[(i - 1) % 2][0] ^ ctxpc5->rngxor[i - 1][0]) % 16;
+
+        ctxpc5->r[(i - 1) % 2][1] = ctxpc5->inv[ctxpc5->r[(i - 1) % 2][1]];
+        
+        if ((ctxpc5->r[(i - 1) % 2][1] - ctxpc5->rngxor[i - 1][1]) < 0) {
+            g = (ctxpc5->r[(i - 1) % 2][1] - ctxpc5->rngxor[i - 1][1]) + 16;
+        } else {
+            g = (ctxpc5->r[(i - 1) % 2][1] - ctxpc5->rngxor[i - 1][1]) % 16;
+        }
+        ctxpc5->r[(i - 1) % 2][1] = g;
+
+        ctxpc5->r[(i - 1) % 2][2] = ctxpc5->tab[ctxpc5->r[(i - 1) % 2][2]];
+        ctxpc5->r[(i - 1) % 2][2] = (ctxpc5->r[(i - 1) % 2][2] ^ ctxpc5->rngxor[i - 1][2]) % 16;
+
+        compute_pc5(ctxpc5, ctxpc5->r[(i - 1) % 2], (uint8_t)((i - 1) % 253));
+
+        ctxpc5->l[i % 2][0] = ctxpc5->r[(i - 1) % 2][0];
+        
+        if ((ctxpc5->l[(i - 1) % 2][0] - ctxpc5->tot[0]) < 0) {
+            g = (ctxpc5->l[(i - 1) % 2][0] - ctxpc5->tot[0]) + 16;
+        } else {
+            g = ctxpc5->l[(i - 1) % 2][0] - ctxpc5->tot[0];
+        }
+        ctxpc5->r[i % 2][0] = g;
+
+        ctxpc5->l[i % 2][1] = ctxpc5->r[(i - 1) % 2][1];
+        ctxpc5->r[i % 2][1] = (ctxpc5->l[(i - 1) % 2][1] ^ ctxpc5->tot[1]) % 16;
+
+        ctxpc5->l[i % 2][2] = ctxpc5->r[(i - 1) % 2][2];
+        
+        if ((ctxpc5->l[(i - 1) % 2][2] - ctxpc5->tot[2]) < 0) {
+            g = (ctxpc5->l[(i - 1) % 2][2] - ctxpc5->tot[2]) + 16;
+        } else {
+            g = ctxpc5->l[(i - 1) % 2][2] - ctxpc5->tot[2];
+        }
+        ctxpc5->r[i % 2][2] = g;
+    }
+
+    for (i = 0; i < 3; i++) {
+        ctxpc5->convert[i + 3] = ctxpc5->l[(ctxpc5->rounds - 1) % 2][i];
+        ctxpc5->convert[i] = ctxpc5->r[(ctxpc5->rounds - 1) % 2][i];
+    }
+}
+
+/* Decrypt one block */
+void pc5decrypt(PC5Context *ctxpc5) {
+    int i;
+
+    for (i = 0; i < 3; i++) {
+        ctxpc5->l[0][i] = ctxpc5->convert[i];
+        ctxpc5->r[0][i] = ctxpc5->convert[i + 3];
+    }
+
+    ctxpc5->y = (uint8_t)((ctxpc5->rounds - 1) % 253);
+    if (ctxpc5->y == 0) ctxpc5->y = 253;
+
+    for (i = 1; i <= ctxpc5->rounds; i++) {
+        ctxpc5->y--;
+        compute_pc5(ctxpc5, ctxpc5->r[(i - 1) % 2], ctxpc5->y);
+        if (ctxpc5->y == 0) ctxpc5->y = 253;
+
+        ctxpc5->result = 0;
+
+        ctxpc5->l[(i - 1) % 2][0] ^= ctxpc5->rngxor[ctxpc5->rounds - i][0];
+        ctxpc5->l[(i - 1) % 2][0] %= 16;
+        ctxpc5->l[(i - 1) % 2][0] = ctxpc5->inv[ctxpc5->l[(i - 1) % 2][0]];
+
+        ctxpc5->l[(i - 1) % 2][1] += ctxpc5->rngxor[ctxpc5->rounds - i][1];
+        ctxpc5->l[(i - 1) % 2][1] %= 16;
+        ctxpc5->l[(i - 1) % 2][1] = ctxpc5->tab[ctxpc5->l[(i - 1) % 2][1]];
+
+        ctxpc5->l[(i - 1) % 2][2] ^= ctxpc5->rngxor[ctxpc5->rounds - i][2];
+        ctxpc5->l[(i - 1) % 2][2] %= 16;
+        ctxpc5->l[(i - 1) % 2][2] = ctxpc5->inv[ctxpc5->l[(i - 1) % 2][2]];
+
+        ctxpc5->result += ((uint32_t)ctxpc5->l[(i - 1) % 2][0] << 8);
+        ctxpc5->result += ((uint32_t)ctxpc5->l[(i - 1) % 2][1] << 4);
+        ctxpc5->result += ctxpc5->l[(i - 1) % 2][2];
+
+        ctxpc5->result = ror(ctxpc5->result, ctxpc5->decal[ctxpc5->rounds - i], 12);
+
+        ctxpc5->l[(i - 1) % 2][0] = (uint8_t)(ctxpc5->result >> 8);
+        ctxpc5->l[(i - 1) % 2][1] = (uint8_t)((ctxpc5->result >> 4) & 0xfu);
+        ctxpc5->l[(i - 1) % 2][2] = (uint8_t)(ctxpc5->result & 0xfu);
+
+        int temp;
+        
+        temp = ctxpc5->l[(i - 1) % 2][0] - ((uint8_t)(~ctxpc5->rngxor2[i - 1][0]) % 16);
+        if (temp < 0) temp += 16;
+        ctxpc5->l[(i - 1) % 2][0] = temp % 16;
+
+        ctxpc5->l[(i - 1) % 2][1] ^= (uint8_t)(~ctxpc5->rngxor2[i - 1][1]) % 16;
+        ctxpc5->l[(i - 1) % 2][1] %= 16;
+
+        temp = ctxpc5->l[(i - 1) % 2][2] - ((uint8_t)(~ctxpc5->rngxor2[i - 1][2]) % 16);
+        if (temp < 0) temp += 16;
+        ctxpc5->l[(i - 1) % 2][2] = temp % 16;
+
+        ctxpc5->l[i % 2][0] = ctxpc5->r[(i - 1) % 2][0];
+        ctxpc5->r[i % 2][0] = (ctxpc5->l[(i - 1) % 2][0] + ctxpc5->tot[0]) % 16;
+
+        ctxpc5->l[i % 2][1] = ctxpc5->r[(i - 1) % 2][1];
+        ctxpc5->r[i % 2][1] = (ctxpc5->l[(i - 1) % 2][1] ^ ctxpc5->tot[1]) % 16;
+
+        ctxpc5->l[i % 2][2] = ctxpc5->r[(i - 1) % 2][2];
+        ctxpc5->r[i % 2][2] = (ctxpc5->l[(i - 1) % 2][2] + ctxpc5->tot[2]) % 16;
+    }
+
+    for (i = 0; i < 3; i++) {
+        ctxpc5->convert[i + 3] = ctxpc5->l[(ctxpc5->rounds - 1) % 2][i];
+        ctxpc5->convert[i] = ctxpc5->r[(ctxpc5->rounds - 1) % 2][i];
+    }
+}
+
+/* Key creation for BAOFENG AP */
+void baofeng_ap_pc5_keystream_creation(dsd_state *state, char *input) {
+    
+    char buf[1024];
+    strncpy(buf, input, sizeof(buf) - 1);
+    buf[sizeof(buf) - 1] = '\0';
+    
+    // Count hexadecimal characters (without spaces)
+    int hex_char_count = 0;
+    for (int i = 0; buf[i] != '\0'; i++) {
+        if (isxdigit(buf[i])) {
+            hex_char_count++;
+        }
+    }
+    
+    if (hex_char_count == 32) { // 128 bits (32 hex characters)
+        unsigned char key1[16] = {0};
+        unsigned char key2[16] = {0};
+        
+        char *pEnd;
+        uint64_t K1 = strtoull(buf, &pEnd, 16);
+        uint64_t K2 = strtoull(pEnd, &pEnd, 16);
+        
+        u64_to_bytes_be_pc5(K1, &key1[0]);
+        u64_to_bytes_be_pc5(K2, &key1[8]);
+
+        // Reverse key for PC5 (only for 128-bit)
+        for (int i=0;i<16;i++) key2[i] = key1[15-i];
+        
+         /* Create key schedule */
+        create_keys_pc5(&ctxpc5, key2, sizeof(key2));
+        ctxpc5.rounds = nbround;
+        
+        fprintf(stderr, "DMR BAOFENG AP (PC5) 128-bit Key %016llX%016llX with Forced Application\n", 
+                (unsigned long long)K1, (unsigned long long)K2);
+        state->baofeng_ap = 1;
+        
+    } else if (hex_char_count == 64) { // 256 bits (64 hex characters)
+        // Remove spaces and store as ASCII string (64 bytes)
+        char ascii_key[65] = {0}; // 64 characters + null terminator
+        int j = 0;
+        for (int i = 0; buf[i] != '\0' && j < 64; i++) {
+            if (isxdigit(buf[i])) {
+                ascii_key[j++] = buf[i];
+            }
+        }
+        ascii_key[64] = '\0';
+        
+         /* Create key schedule */
+        create_keys_pc5(&ctxpc5, (unsigned char*)ascii_key, 64);
+        ctxpc5.rounds = nbround;
+        
+        fprintf(stderr, "DMR BAOFENG AP (PC5) 256-bit Key: %s with Forced Application\n", ascii_key);
+        state->baofeng_ap = 1;
+        
+    } else {
+        fprintf(stderr, "ERROR: Invalid key length. Expected 32 chars (128-bit) or 64 chars (256-bit), got %d hex chars\n", hex_char_count);
+        return;
+    }
+}
--- a/src/crypt-rc2.c
+++ b/src/crypt-rc2.c
@@ -0,0 +1,404 @@
+#include "rc2.h"
+#include "dsd.h"
+
+static inline uint64_t rol64(uint64_t x, int n) {
+    return ((x << n) | (x >> (63 - n) >> 1)) & 0xffffffffffffffff;
+}
+
+void swapbit(uint64_t* internalstate, uint8_t bit) {
+    unsigned char bitB = bit & 1;
+    if (bitB)
+        *internalstate |= bitB;
+    else
+        *internalstate &= (~bitB ^ 1);
+}
+
+// MD2 functions
+void md2_init(MD2State* state) {
+    state->x1 = 0;
+    state->x2 = 0;
+    memset(state->h2, 0, n1);
+    memset(state->h1, 0, n1 * 3);
+}
+
+void md2_hashing(MD2State* state, unsigned char t1[], size_t b6) {
+    static unsigned char s4[256] = {
+        13,199,11,67,237,193,164,77,115,184,141,222,73,
+        38,147,36,150,87,21,104,12,61,156,101,111,145,
+        119,22,207,35,198,37,171,167,80,30,219,28,213,
+        121,86,29,214,242,6,4,89,162,110,175,19,157,
+        3,88,234,94,144,118,159,239,100,17,182,173,238,
+        68,16,79,132,54,163,52,9,58,57,55,229,192,
+        170,226,56,231,187,158,70,224,233,245,26,47,32,
+        44,247,8,251,20,197,185,109,153,204,218,93,178,
+        212,137,84,174,24,120,130,149,72,180,181,208,255,
+        189,152,18,143,176,60,249,27,227,128,139,243,253,
+        59,123,172,108,211,96,138,10,215,42,225,40,81,
+        65,90,25,98,126,154,64,124,116,122,5,1,168,
+        83,190,131,191,244,240,235,177,155,228,125,66,43,
+        201,248,220,129,188,230,62,75,71,78,34,31,216,
+        254,136,91,114,106,46,217,196,92,151,209,133,51,
+        236,33,252,127,179,69,7,183,105,146,97,39,15,
+        205,112,200,166,223,45,48,246,186,41,148,140,107,
+        76,85,95,194,142,50,49,134,23,135,169,221,210,
+        203,63,165,82,161,202,53,14,206,232,103,102,195,
+        117,250,99,0,74,160,241,2,113
+    };
+   
+    int b4 = 0;
+    
+    while (b6) {
+        for (; b6 && state->x2 < n1; b6--, state->x2++) {
+            int b5 = t1[b4++];
+            state->h1[state->x2 + n1] = b5;
+            state->h1[state->x2 + (n1 * 2)] = b5 ^ state->h1[state->x2];
+            state->x1 = state->h2[state->x2] ^= s4[b5 ^ state->x1];
+        }
+
+        if (state->x2 == n1) {
+            int b2 = 0;
+            state->x2 = 0;
+            
+            for (int b3 = 0; b3 < (n1 + 2); b3++) {
+                for (int b1 = 0; b1 < (n1 * 3); b1++)
+                    b2 = state->h1[b1] ^= s4[b2];
+                b2 = (b2 + b3) % 256;
+            }
+        }
+    }
+}
+
+void md2_end(MD2State* state, unsigned char h4[n1]) {
+    unsigned char h3[n1];
+    int n4 = n1 - state->x2;
+    for (int i = 0; i < n4; i++) h3[i] = n4;
+    md2_hashing(state, h3, n4);
+    md2_hashing(state, state->h2, sizeof(state->h2));
+    for (int i = 0; i < n1; i++) h4[i] = state->h1[i];
+}
+
+// RC4 functions
+uint64_t next(RC4State* state) {
+    uint64_t z = (state->x += 0x9e3779b97f4a7c15);
+    z = (z ^ (z >> 30)) * 0xbf58476d1ce4e5b9;
+    z = (z ^ (z >> 27)) * 0x94d049bb133111eb;
+    return z ^ (z >> 31);
+}
+
+void rc4_init(RC4State* state, unsigned char key[]) {
+    int tmp;
+    
+    for (state->i_rc4 = 0; state->i_rc4 < 256; state->i_rc4++) {
+        state->array_rc4[state->i_rc4] = state->i_rc4;
+    }
+    
+    state->j_rc4 = 0;
+    for (state->i_rc4 = 0; state->i_rc4 < 256; state->i_rc4++) {
+        state->j_rc4 = (state->j_rc4 + state->array_rc4[state->i_rc4] + key[state->i_rc4 % 256]) % 256;
+        tmp = state->array_rc4[state->i_rc4];
+        state->array_rc4[state->i_rc4] = state->array_rc4[state->j_rc4];
+        state->array_rc4[state->j_rc4] = tmp;
+    }
+    state->i_rc4 = 0;
+    state->j_rc4 = 0;
+}
+
+unsigned char rc4_output(RC4State* state) {
+    uint8_t rndbyte, decal;
+    int tmp, t;
+
+    state->i_rc4 = (state->i_rc4 + 1) % 256;
+    state->j_rc4 = (state->j_rc4 + state->array_rc4[state->i_rc4]) % 256;
+    tmp = state->array_rc4[state->i_rc4];
+    state->array_rc4[state->i_rc4] = state->array_rc4[state->j_rc4];
+    state->array_rc4[state->j_rc4] = tmp;
+    t = (state->array_rc4[state->i_rc4] + state->array_rc4[state->j_rc4]) % 256;
+
+    
+        if (state->xyz == 0) state->bb = next(state);
+        decal = 56 - (8 * state->xyz);
+        rndbyte = (state->bb >> decal) & 0xff;
+        state->xyz++;
+        if (state->xyz == 8) state->xyz = 0;
+        
+        if (state->count == 0) {
+            rndbyte = rndbyte ^ state->array_rc4[t];
+            state->count = 1;
+        } else {
+            rndbyte = rndbyte + state->array_rc4[t];
+            state->count = 0;
+        }
+   
+   
+    return rndbyte;
+}
+
+/* Convert 64-bit integer to bytes (big-endian) */
+static void u64_to_bytes_be(uint64_t val, unsigned char *out) {
+    for (int i = 0; i < 8; i++) {
+        out[i] = (unsigned char)((val >> (56 - 8 * i)) & 0xFF);
+    }
+}
+
+// RC2 functions
+void rc2_keyschedule(RC2State* state) {
+    unsigned i;
+    // Phase 3 - copy to xkey in little-endian order
+    i = 63;
+    do {
+        state->xkey[i] = ((unsigned char *)state->xkey)[2 * i] +
+                        (((unsigned char *)state->xkey)[2 * i + 1] << 8);
+    } while (i--);
+}
+
+void rc2_encrypt(RC2State* state) {
+    uint16_t x76, x54, x32, x10, i;
+
+    x76 = (state->plain[7] << 8) + state->plain[6];
+    x54 = (state->plain[5] << 8) + state->plain[4];
+    x32 = (state->plain[3] << 8) + state->plain[2];
+    x10 = (state->plain[1] << 8) + state->plain[0];
+
+    for (i = 0; i < 16; i++) {
+        x10 += (x32 & ~x76) + (x54 & x76) + state->xkey[4 * i + 0];
+        x10 = (x10 << 1) + (x10 >> 15 & 1);
+        
+        x32 += (x54 & ~x10) + (x76 & x10) + state->xkey[4 * i + 1];
+        x32 = (x32 << 2) + (x32 >> 14 & 3);
+
+        x54 += (x76 & ~x32) + (x10 & x32) + state->xkey[4 * i + 2];
+        x54 = (x54 << 3) + (x54 >> 13 & 7);
+
+        x76 += (x10 & ~x54) + (x32 & x54) + state->xkey[4 * i + 3];
+        x76 = (x76 << 5) + (x76 >> 11 & 31);
+
+        if (i == 4 || i == 10) {
+            x10 += state->xkey[x76 & 63];
+            x32 += state->xkey[x10 & 63];
+            x54 += state->xkey[x32 & 63];
+            x76 += state->xkey[x54 & 63];
+        }
+    }
+
+    state->cipher[0] = (unsigned char)x10;
+    state->cipher[1] = (unsigned char)(x10 >> 8);
+    state->cipher[2] = (unsigned char)x32;
+    state->cipher[3] = (unsigned char)(x32 >> 8);
+    state->cipher[4] = (unsigned char)x54;
+    state->cipher[5] = (unsigned char)(x54 >> 8);
+    state->cipher[6] = (unsigned char)x76;
+    state->cipher[7] = (unsigned char)(x76 >> 8);
+    
+}
+
+// Main cryptographic functions
+void create_keys_rc2(CryptoContext* ctx, unsigned char key1[], size_t size1) {
+    unsigned char h4[n1];
+    
+    // Initialize MD2 and hash the key
+    md2_init(&ctx->md2);
+    md2_hashing(&ctx->md2, key1, size1);
+    md2_end(&ctx->md2, h4);
+    
+    // Copy first 16 bytes to keys
+    for (int i = 0; i < 16; i++) ctx->keys[i] = h4[i];
+    
+    // Initialize RC4 with hashed key
+    rc4_init(&ctx->rc4, h4);
+    
+    // Initialize RC4 state variables
+    ctx->rc4.x = 0;
+    for (int i = 0; i < 8; i++) ctx->rc4.x = (ctx->rc4.x << 8) + (h4[256 + i] & 0xff);
+    
+    ctx->rc4.xyz = 0;
+    ctx->rc4.count = 0;
+    
+    // Warm-up RC4
+    for (int i = 0; i < 22000; i++) rc4_output(&ctx->rc4);
+    
+    // Generate RC2 keys
+    int k = rc4_output(&ctx->rc4) + 256;
+    for (int i = 0; i < k; i++) rc4_output(&ctx->rc4);
+    
+    for (int i = 0; i < 64; i++) {
+        ctx->rc2.xkey[i] = (rc4_output(&ctx->rc4) << 8) + rc4_output(&ctx->rc4);
+    }
+    
+    // Generate internal zero value
+    k = rc4_output(&ctx->rc4) + 256;
+    for (int i = 0; i < k; i++) rc4_output(&ctx->rc4);
+    
+    ctx->internal_zero = 0;
+    for (int i = 0; i < 8; i++) {
+        ctx->internal_zero = (ctx->internal_zero << 8) + rc4_output(&ctx->rc4);
+    }
+    
+    // Generate RC2 key schedule
+    rc2_keyschedule(&ctx->rc2);
+}
+
+void encryption_rc2(CryptoContext* ctx, uint8_t bits[49]) {
+    ctx->internal_state = ctx->internal_zero;
+
+    for (int sso = 0; sso < 49; sso++) {
+        // Prepare plaintext from internal state
+        ctx->rc2.plain[0] = (ctx->internal_state >> 56) & 0xff;
+        ctx->rc2.plain[1] = (ctx->internal_state >> 48) & 0xff;
+        ctx->rc2.plain[2] = (ctx->internal_state >> 40) & 0xff;
+        ctx->rc2.plain[3] = (ctx->internal_state >> 32) & 0xff;
+        ctx->rc2.plain[4] = (ctx->internal_state >> 24) & 0xff;
+        ctx->rc2.plain[5] = (ctx->internal_state >> 16) & 0xff;
+        ctx->rc2.plain[6] = (ctx->internal_state >> 8) & 0xff;
+        ctx->rc2.plain[7] = ctx->internal_state & 0xff;
+        
+        // Encrypt with RC2
+        rc2_encrypt(&ctx->rc2);
+        
+        // Reconstruct internal state from ciphertext
+        ctx->internal_state = 0;
+        for (int i = 0; i < 8; i++) {
+            ctx->internal_state = (ctx->internal_state << 8) + (ctx->rc2.cipher[i] & 0xff);
+        }
+                
+        // XOR the bit and update internal state
+        bits[48 - sso] = bits[48 - sso] ^ (ctx->internal_state & 1);
+        ctx->internal_state = rol64(ctx->internal_state, 1);
+        swapbit(&ctx->internal_state, bits[48 - sso]);
+    }
+}
+
+void decrypt_rc2(CryptoContext* ctx, uint8_t bits[49]) {
+    uint8_t tempy;
+    ctx->internal_state = ctx->internal_zero;
+
+    
+    for (int sso = 0; sso < 49; sso++) {
+        // Prepare plaintext from internal state
+        ctx->rc2.plain[0] = (ctx->internal_state >> 56) & 0xff;
+        ctx->rc2.plain[1] = (ctx->internal_state >> 48) & 0xff;
+        ctx->rc2.plain[2] = (ctx->internal_state >> 40) & 0xff;
+        ctx->rc2.plain[3] = (ctx->internal_state >> 32) & 0xff;
+        ctx->rc2.plain[4] = (ctx->internal_state >> 24) & 0xff;
+        ctx->rc2.plain[5] = (ctx->internal_state >> 16) & 0xff;
+        ctx->rc2.plain[6] = (ctx->internal_state >> 8) & 0xff;
+        ctx->rc2.plain[7] = ctx->internal_state & 0xff;
+       
+        // Encrypt with RC2
+        rc2_encrypt(&ctx->rc2);
+        
+        // Reconstruct internal state from ciphertext
+        ctx->internal_state = 0;
+        for (int i = 0; i < 8; i++) {
+            ctx->internal_state = (ctx->internal_state << 8) + (ctx->rc2.cipher[i] & 0xff);
+        }
+
+        // XOR the bit and update internal state
+        tempy = bits[48 - sso];
+        bits[48 - sso] = bits[48 - sso] ^ (ctx->internal_state & 1);
+        ctx->internal_state = rol64(ctx->internal_state, 1);
+        swapbit(&ctx->internal_state, tempy);
+        
+    }
+}
+
+/* Key creation for Retevis AP */
+void retevis_rc2_keystream_creation(dsd_state *state, char *input) {
+ 
+    unsigned char key1[64]; memset(key1, 0, sizeof(key1));
+    unsigned char key2[64]; memset(key2, 0, sizeof(key2));
+    
+    char buf[1024];
+    strncpy(buf, input, sizeof(buf) - 1);
+    buf[sizeof(buf) - 1] = '\0';
+    
+    char *pEnd;
+    uint64_t K1 = strtoull(buf, &pEnd, 16);
+    uint64_t K2 = strtoull(pEnd, &pEnd, 16);
+    uint64_t K3 = strtoull(pEnd, &pEnd, 16);
+    uint64_t K4 = strtoull(pEnd, &pEnd, 16);
+    
+    if (K3 != 0 || K4 != 0) //256-bit keys loaded as ASCII characters
+    {
+        //start loading K1, K2, K3, and K4 as ASCII to fill 64 bytes of key1
+        int k = 0; uint8_t x = 0;
+
+        for (int i = 0; i < 16; i++)
+        {
+            x = ((K1 >> (60-(i*4))) & 0xF);
+            if (x >= 0 && x <= 9) //numbers 0-9
+                x += 0x30;  //ASCII representation of numbers is 0x30, 0x31....0x39
+            else x += 0x37; //Upper ASCII A,B,C,D,E,F is 0x41, 0x42...0x46
+            key1[k++] = x;
+        }
+
+        for (int i = 0; i < 16; i++)
+        {
+            x = ((K2 >> (60-(i*4))) & 0xF);
+            if (x >= 0 && x <= 9) //numbers 0-9
+                x += 0x30;  //ASCII representation of numbers is 0x30, 0x31....0x39
+            else x += 0x37; //Upper ASCII A,B,C,D,E,F is 0x41, 0x42...0x46
+            key1[k++] = x;
+        }
+
+        for (int i = 0; i < 16; i++)
+        {
+            x = ((K3 >> (60-(i*4))) & 0xF);
+            if (x >= 0 && x <= 9) //numbers 0-9
+                x += 0x30;  //ASCII representation of numbers is 0x30, 0x31....0x39
+            else x += 0x37; //Upper ASCII A,B,C,D,E,F is 0x41, 0x42...0x46
+            key1[k++] = x;
+        }
+
+        for (int i = 0; i < 16; i++)
+        {
+            x = ((K4 >> (60-(i*4))) & 0xF);
+            if (x >= 0 && x <= 9) //numbers 0-9
+                x += 0x30;  //ASCII representation of numbers is 0x30, 0x31....0x39
+            else x += 0x37; //Upper ASCII A,B,C,D,E,F is 0x41, 0x42...0x46
+            key1[k++] = x;
+        }
+
+        //debug
+        // fprintf (stderr, "ASCII: ");
+        // for (int i = 0; i < 64; i++)
+        //     fprintf (stderr, " %02X", key1[i]);
+        // fprintf (stderr, "\n");
+
+        // Initialize RC2 context
+        static CryptoContext rc2_ctx;
+        create_keys_rc2(&rc2_ctx, key1, 64);
+        
+        // Store context in DSD state
+        state->rc2_context = malloc(sizeof(CryptoContext));
+        memcpy(state->rc2_context, &rc2_ctx, sizeof(CryptoContext));
+
+        fprintf(stderr, "DMR RETEVIS AP (RC2) 256-bit Key %016llX%016llX%016llX%016llX with Forced Application\n", 
+            (unsigned long long)K1, (unsigned long long)K2, (unsigned long long)K3, (unsigned long long)K4);
+
+        state->retevis_ap = 1;
+    }
+
+    else //128-bit loaded as reverse bytes
+    {
+
+        u64_to_bytes_be(K1, &key1[0]);
+        u64_to_bytes_be(K2, &key1[8]);
+
+        // reverse load the key bytes into key2
+        for (int i=0;i<16;i++)
+            key2[i] = key1[15-i];
+        
+        // Initialize RC2 context
+        static CryptoContext rc2_ctx;
+        create_keys_rc2(&rc2_ctx, key2, 16);
+        
+        // Store context in DSD state
+        state->rc2_context = malloc(sizeof(CryptoContext));
+        memcpy(state->rc2_context, &rc2_ctx, sizeof(CryptoContext));
+        
+        fprintf(stderr, "DMR RETEVIS AP (RC2) 128-bit Key %016llX%016llX with Forced Application\n", 
+            (unsigned long long)K1, (unsigned long long)K2);
+
+        state->retevis_ap = 1;
+    }
+}
--- a/src/crypt-rc4.c
+++ b/src/crypt-rc4.c
@@ -0,0 +1,146 @@
+/*-------------------------------------------------------------------------------
+ * rc4.c         Crypthings
+ * RC4 Alg
+ *-----------------------------------------------------------------------------*/
+
+#include "dsd.h"
+
+//this version is for voice, going to transition to a block output version
+void rc4_voice_decrypt(int drop, uint8_t keylength, uint8_t messagelength, uint8_t key[], uint8_t cipher[], uint8_t plain[])
+{
+  int i, j, count;
+  uint8_t t, b;
+
+  //init Sbox
+  uint8_t S[256];
+  for(int i = 0; i < 256; i++) S[i] = i;
+
+  //Key Scheduling
+  j = 0;
+  for(i = 0; i < 256; i++)
+  {
+    j = (j + S[i] + key[i % keylength]) % 256;
+    t = S[i];
+    S[i] = S[j];
+    S[j] = t;
+  }
+
+  //Drop Bytes and Cipher Byte XOR
+  i = j = 0;
+  for(count = 0; count < (messagelength + drop); count++)
+  {
+    i = (i + 1) % 256;
+    j = (j + S[i]) % 256;
+    t = S[i];
+    S[i] = S[j];
+    S[j] = t;
+    b = S[(S[i] + S[j]) % 256];
+
+    //return mbe payload byte here
+    if (count >= drop)
+      plain[count - drop] = b^cipher[count - drop];
+
+  }
+
+}
+
+//this is for PDU usage
+void rc4_block_output (int drop, int keylen, int meslen, uint8_t * key, uint8_t * output_blocks)
+{
+  int i, j, x, count;
+  unsigned int keylength = (unsigned int)keylen;
+  unsigned int messagelength = (unsigned int)meslen;
+  unsigned int S[256];
+
+  for(i=0; i<256; i++)
+    S[i] = i;
+
+  j = 0;
+  for(i = 0; i<256; i++)
+  {
+    j = (j + S[i] + key[i % keylength]) % 256;
+    unsigned int temp = S[i];
+    S[i] = S[j];
+    S[j] = temp;
+  }
+
+  //Generate Keystream
+  i = 0;
+  j = 0;
+  x = 0;
+  unsigned int byte;
+
+  // fprintf (stderr, " Keystream Octets = ");
+  for(count = 0; count < (messagelength + drop); count++)
+  {
+    i = (i + 1) % 256;
+    j = (j + S[i]) % 256;
+    unsigned int temp = S[i];
+    S[i] = S[j];
+    S[j] = temp;
+    byte = S[(S[i] + S[j]) % 256];
+
+    //Collect Output blocks
+    if (count >= drop)
+      output_blocks[x++] = byte;
+
+  }
+
+}
+
+//This is now verified to work after changing the drop byte value from 256 to 0.
+//also, had to change the application to not skip the additional 7 bits like DMRA or P25 does.
+void hytera_enhanced_rc4_setup(dsd_opts * opts, dsd_state * state, unsigned long long int key_value, unsigned long long int mi_value)
+{
+
+  UNUSED(opts);
+  uint8_t key[5];  memset (key, 0, sizeof(key));
+  uint8_t kiv[5];  memset (kiv, 0, sizeof(kiv));
+  uint8_t mi[5];   memset (mi, 0, sizeof(mi));
+  uint8_t ks[135]; memset (ks, 0, sizeof(ks));
+
+  //load key_value into key array
+  key[0] = ((key_value & 0xFF00000000) >> 32UL);
+  key[1] = ((key_value & 0xFF000000) >> 24);
+  key[2] = ((key_value & 0xFF0000) >> 16);
+  key[3] = ((key_value & 0xFF00) >> 8);
+  key[4] = ((key_value & 0xFF) >> 0);
+
+  //load mi_value into mi array
+  mi[0] = ((mi_value & 0xFF00000000) >> 32UL);
+  mi[1] = ((mi_value & 0xFF000000) >> 24);
+  mi[2] = ((mi_value & 0xFF0000) >> 16);
+  mi[3] = ((mi_value & 0xFF00) >> 8);
+  mi[4] = ((mi_value & 0xFF) >> 0);
+
+  //pointer to the ks_octet storage
+  uint8_t * ks_octets;
+  if (state->currentslot == 0)
+    ks_octets = state->ks_octetL;
+  else ks_octets = state->ks_octetR;
+
+  //NOTE: Drop Byte value is 0
+  rc4_block_output(0, 5, 135, key, ks);
+
+  for (int i = 0; i < 5; i++)
+    kiv[i] = key[i] ^ mi[i];
+
+  for (int i = 0; i < 135; i++)
+    ks_octets[i] = kiv[i%5] ^ ks[i];
+
+  //debug
+  // fprintf (stderr, " KS: ");
+  // for (int i = 0; i < 135; i++)
+  // {
+  //   if ((i != 0) && ((i%7) == 0))
+  //     fprintf (stderr, " ");
+  //   fprintf (stderr, "%02X", ks[i]); //ks_octets
+  // }
+
+  //NULL pointer to ks_octets
+  ks_octets = NULL;
+
+  //end line break
+  // fprintf (stderr, "\n");
+
+}
--- a/src/crypt-tyt.c
+++ b/src/crypt-tyt.c
@@ -0,0 +1,361 @@
+#include "dsd.h"
+#include "dmr_const.h"
+#include "pc4.h"
+
+//interleaved code words for AMBE+2 (as it arrives over the air)
+void ambe2_codeword_print_i (dsd_opts * opts, char ambe_fr[4][24])
+{
+  uint8_t interleaved[72];
+  memset (interleaved, 0, sizeof(interleaved));
+
+  //reinterleave the frame
+  const int *w, *x, *y, *z;
+  w = rW; x = rX; y = rY; z = rZ;
+
+  for (int8_t i = 0; i < 36; i++)
+  {
+    interleaved[(i*2)+0] = (uint8_t)ambe_fr[*w][*x];
+    interleaved[(i*2)+1] = (uint8_t)ambe_fr[*y][*z];
+
+    w++;
+    x++;
+    y++;
+    z++;
+  }
+
+  uint8_t bytes[9]; memset(bytes, 0, sizeof(bytes));
+
+  //pack
+  pack_bit_array_into_byte_array(interleaved, bytes, 9);
+
+  if (opts->payload == 1)
+  {
+    fprintf (stderr, " AMBE HEX(72) INT: ");
+    for (int8_t i = 0; i < 9; i++)
+      fprintf (stderr, "%02X", bytes[i]);
+    fprintf (stderr, "\n");
+  }
+    
+}
+
+//de-interleaved code words for AMBE+2
+void ambe2_codeword_print_b (dsd_opts * opts, char ambe_fr[4][24])
+{
+  uint8_t fr_reverse[4][24]; memset(fr_reverse, 0, sizeof(fr_reverse));
+  for (int i = 0; i < 24; i++)
+    fr_reverse[0][i] = ambe_fr[0][23-i];
+  for (int i = 0; i < 23; i++)
+    fr_reverse[1][i] = ambe_fr[1][22-i];
+  for (int i = 0; i < 11; i++)
+    fr_reverse[2][i] = ambe_fr[2][10-i];
+  for (int i = 0; i < 14; i++)
+    fr_reverse[3][i] = ambe_fr[3][13-i];
+
+  uint32_t v0 = (uint32_t)convert_bits_into_output((uint8_t *)fr_reverse[0], 24); //24
+  uint32_t v1 = (uint32_t)convert_bits_into_output((uint8_t *)fr_reverse[1], 23); //23
+  uint32_t v2 = (uint32_t)convert_bits_into_output((uint8_t *)fr_reverse[2], 11); //11
+  uint32_t v3 = (uint32_t)convert_bits_into_output((uint8_t *)fr_reverse[3], 14); //14
+  
+  uint32_t c0 = (uint32_t)convert_bits_into_output((uint8_t *)fr_reverse[0], 12);
+  uint32_t c1 = (uint32_t)convert_bits_into_output((uint8_t *)fr_reverse[1], 12);
+
+  //72 bit version
+  unsigned long long int hex1 = ((unsigned long long int)v0 << 40ULL) + ((unsigned long long int)v1 << 17ULL) + ((unsigned long long int)v2 << 6ULL) + (v3 >> 8); 
+  unsigned long long int hex2 = v3 & 0xFF;
+
+  //49 bit version prior to golay correction and c1 demodulation pN
+  unsigned long long int hex49 = ((unsigned long long int)c0 << 37ULL) + ((unsigned long long int)c1 << 25ULL) + ((unsigned long long int)v2 << 14ULL) + v3;
+
+  UNUSED(opts);
+
+  if (opts->payload == 1)
+  {
+    fprintf (stderr, " AMBE HEX(72): %016llX%02llX \n", hex1, hex2);
+    fprintf (stderr, " AMBE HEX(49): %014llX\n", hex49 << 7);
+  }
+
+}
+
+//de-interleaved code words for AMBE+2
+void ambe2_codeword_print_f (dsd_opts * opts, char ambe_fr[4][24])
+{
+  uint32_t v0 = (uint32_t)convert_bits_into_output((uint8_t *)ambe_fr[0], 24); //24
+  uint32_t v1 = (uint32_t)convert_bits_into_output((uint8_t *)ambe_fr[1], 23); //23
+  uint32_t v2 = (uint32_t)convert_bits_into_output((uint8_t *)ambe_fr[2], 11); //11
+  uint32_t v3 = (uint32_t)convert_bits_into_output((uint8_t *)ambe_fr[3], 14); //14
+
+  // if (opts->payload == 1)
+  //   fprintf (stderr, " AMBE V0: %06X; V1: %06X; V2: %03X; V3: %04X; \n", v0, v1, v2, v3);
+
+  unsigned long long int hex1 = ((unsigned long long int)v0 << 40ULL) + ((unsigned long long int)v1 << 17ULL) + ((unsigned long long int)v2 << 6ULL) + (v3 >> 8); 
+  unsigned long long int hex2 = v3 & 0xFF;
+
+  if (opts->payload == 1)
+    fprintf (stderr, " AMBE HEX(72): %016llX%02llX \n", hex1, hex2);
+
+}
+
+//NOTE: This mode DOES NOT work over a repeater, simplex only
+//repeaters may or will attempt to correct the frame errors
+void tyt16_ambe2_codeword_keystream(dsd_state * state, char ambe_fr[4][24], int fnum)
+{
+
+  char interleaved[72];
+  memset (interleaved, 0, sizeof(interleaved));
+
+  //interleave the frame
+  const int *w, *x, *y, *z;
+  w = rW; x = rX; y = rY; z = rZ;
+
+  for (int8_t i = 0; i < 36; i++)
+  {
+    interleaved[(i*2)+0] = ambe_fr[*w][*x];
+    interleaved[(i*2)+1] = ambe_fr[*y][*z];
+
+    w++;
+    x++;
+    y++;
+    z++;
+  }
+
+  uint8_t ks_bytes[10]; memset(ks_bytes, 0, sizeof(ks_bytes));
+  uint8_t ks[80]; memset(ks, 0, sizeof(ks));
+
+  ks_bytes[0] = (state->H >> 8) & 0xFF;
+  ks_bytes[1] = (state->H >> 0) & 0xFF;
+
+  //copy same bytes into rest of byte array
+  for (int16_t i = 2; i < 10; i++)
+    ks_bytes[i] = ks_bytes[i%2];
+
+  //convert byte array into a bit array
+  unpack_byte_array_into_bit_array(ks_bytes, ks, 10);
+
+  //set ks idx position (-1)
+  int idx = 0;
+  if (fnum == 0)
+    idx = 79;
+  else idx = 71;
+
+  //apply keystream to interleave
+  for (int8_t i = 0; i < 72; i++)
+    interleaved[i] ^= ks[idx--];
+
+  //deinterleave back into ambe_fr frame
+  w = rW; x = rX; y = rY; z = rZ;
+  int k = 0;
+  for (int8_t i = 0; i < 36; i++)
+  {
+    ambe_fr[*w][*x] = interleaved[k++];
+    ambe_fr[*y][*z] = interleaved[k++];
+
+    w++;
+    x++;
+    y++;
+    z++;
+  }
+
+}
+
+void tyt_ap_pc4_keystream_creation(dsd_state * state, char * input)
+{
+  unsigned char key1[64]; memset(key1, 0, sizeof(key1));
+  unsigned char key2[64]; memset(key2, 0, sizeof(key2));
+  
+  char buf[1024];
+  strncpy(buf, input, sizeof(buf) - 1);
+  buf[sizeof(buf) - 1] = '\0';
+  
+  char *pEnd;
+  uint64_t K1 = strtoull(buf, &pEnd, 16);
+  uint64_t K2 = strtoull(pEnd, &pEnd, 16);
+  uint64_t K3 = strtoull(pEnd, &pEnd, 16);
+  uint64_t K4 = strtoull(pEnd, &pEnd, 16);
+  
+  if (K3 != 0 || K4 != 0) //256-bit keys loaded as ASCII characters
+  {
+      //start loading K1, K2, K3, and K4 as ASCII to fill 64 bytes of key1
+      int k = 0; uint8_t x = 0;
+
+      for (int i = 0; i < 16; i++)
+      {
+          x = ((K1 >> (60-(i*4))) & 0xF);
+          if (x >= 0 && x <= 9) //numbers 0-9
+              x += 0x30;  //ASCII representation of numbers is 0x30, 0x31....0x39
+          else x += 0x37; //Upper ASCII A,B,C,D,E,F is 0x41, 0x42...0x46
+          key1[k++] = x;
+      }
+
+      for (int i = 0; i < 16; i++)
+      {
+          x = ((K2 >> (60-(i*4))) & 0xF);
+          if (x >= 0 && x <= 9) //numbers 0-9
+              x += 0x30;  //ASCII representation of numbers is 0x30, 0x31....0x39
+          else x += 0x37; //Upper ASCII A,B,C,D,E,F is 0x41, 0x42...0x46
+          key1[k++] = x;
+      }
+
+      for (int i = 0; i < 16; i++)
+      {
+          x = ((K3 >> (60-(i*4))) & 0xF);
+          if (x >= 0 && x <= 9) //numbers 0-9
+              x += 0x30;  //ASCII representation of numbers is 0x30, 0x31....0x39
+          else x += 0x37; //Upper ASCII A,B,C,D,E,F is 0x41, 0x42...0x46
+          key1[k++] = x;
+      }
+
+      for (int i = 0; i < 16; i++)
+      {
+          x = ((K4 >> (60-(i*4))) & 0xF);
+          if (x >= 0 && x <= 9) //numbers 0-9
+              x += 0x30;  //ASCII representation of numbers is 0x30, 0x31....0x39
+          else x += 0x37; //Upper ASCII A,B,C,D,E,F is 0x41, 0x42...0x46
+          key1[k++] = x;
+      }
+
+      //debug
+      // fprintf (stderr, "ASCII: ");
+      // for (int i = 0; i < 64; i++)
+      //     fprintf (stderr, " %02X", key1[i]);
+      // fprintf (stderr, "\n");
+
+      /* Create key schedule */
+      create_keys(&ctx, key1, 64);
+      ctx.rounds = nbround;
+
+      fprintf(stderr, "DMR TYT AP (PC4) 256-bit Key %016llX%016llX%016llX%016llX with Forced Application\n", 
+          (unsigned long long)K1, (unsigned long long)K2, (unsigned long long)K3, (unsigned long long)K4);
+
+      state->tyt_ap = 1;
+  }
+
+  else //128-bit loaded as reverse bytes
+  {
+
+      u64_to_bytes_be(K1, &key1[0]);
+      u64_to_bytes_be(K2, &key1[8]);
+
+      // reverse load the key bytes into key2
+      for (int i=0;i<16;i++)
+          key2[i] = key1[15-i];
+      
+      /* Create key schedule */
+      create_keys(&ctx, key2, 16);
+      ctx.rounds = nbround;
+      
+      fprintf (stderr,"DMR TYT AP (PC4) 128-bit Key %016llX%016llX with Forced Application\n", 
+        (unsigned long long int)K1, (unsigned long long int)K2);
+
+      state->tyt_ap = 1;
+  }
+  
+  
+}
+
+void tyt_ep_aes_keystream_creation(dsd_state * state, char * input)
+{
+  char buf[1024];
+  strncpy(buf, input, 1023);
+  buf[1023] = '\0';
+
+  char *pEnd;
+  unsigned long long int K1 = strtoull (buf, &pEnd, 16);
+  unsigned long long int K2 = strtoull (pEnd, &pEnd, 16);
+
+  //
+  uint8_t static_key[32];
+  memset(static_key, 0, sizeof(static_key));
+
+  //static key value
+  static_key[0]=0x6e;  static_key[1]=0x02;  static_key[2]=0x8d;  static_key[3]=0x8a;
+  static_key[4]=0xca;  static_key[5]=0xeb;  static_key[6]=0x9b;  static_key[7]=0xbe;
+  static_key[8]=0x42;  static_key[9]=0x72;  static_key[10]=0xfb; static_key[11]=0x82;
+  static_key[12]=0x64; static_key[13]=0x56; static_key[14]=0x31; static_key[15]=0xfa;
+
+  //the key value provided by user
+  uint8_t user_key[16];
+  memset(user_key, 0, sizeof(user_key));
+
+  //Load user key into array to manipulate
+  for (int i = 0; i < 8; i++)
+  {
+    user_key[i+0]  = (K1 >> (56-(i*8))) & 0xFF;
+    user_key[i+8]  = (K2 >> (56-(i*8))) & 0xFF;
+  }
+
+  uint8_t input_register[16];
+  memset(input_register, 0, sizeof(input_register));
+
+  //manipulate user provided key by loading bytes in reverse order into the input_register
+  for (int i = 0; i < 16; i++)
+  input_register[15-i] = user_key[i];
+
+  uint8_t ks_bytes[16];
+  memset(ks_bytes, 0, sizeof(ks_bytes));
+
+  //create keystream
+  aes_ofb_keystream_output(input_register, static_key, ks_bytes, 0, 1);
+  uint8_t ks_bits[128];
+  memset(ks_bits, 0, sizeof(ks_bits));
+  unpack_byte_array_into_bit_array(ks_bytes, ks_bits, 16);
+
+  //load static keystream into ctx.bits since that isn't ever zeroed out
+  for (int i = 0; i < 49; i++)
+    ctx.bits[i] = ks_bits[i];
+
+  fprintf (stderr,"DMR TYT EP (AES-128) Key %016llX%016llX with Forced Application\n", K1, K2);
+  state->tyt_ep = 1;
+
+}
+
+//connect systems 72-bit (9-byte) Extended Encryption //TODO: Move this later
+void csi72_ambe2_codeword_keystream(dsd_state * state, char ambe_fr[4][24])
+{
+
+  char interleaved[72];
+  memset (interleaved, 0, sizeof(interleaved));
+
+  //interleave the frame
+  const int *w, *x, *y, *z;
+  w = rW; x = rX; y = rY; z = rZ;
+
+  for (int8_t i = 0; i < 36; i++)
+  {
+    interleaved[(i*2)+0] = ambe_fr[*w][*x];
+    interleaved[(i*2)+1] = ambe_fr[*y][*z];
+
+    w++;
+    x++;
+    y++;
+    z++;
+  }
+
+  uint8_t ks_bytes[9]; memset(ks_bytes, 0, sizeof(ks_bytes));
+  uint8_t ks[72]; memset(ks, 0, sizeof(ks));
+
+  //keys are loaded in reverse byte order, stored in state->static_ks_bits[0] 
+  for (int i = 0; i < 9; i++)
+    ks_bytes[i] = state->static_ks_bits[0][8-i];
+
+  //convert byte array into a bit array
+  unpack_byte_array_into_bit_array(ks_bytes, ks, 9);
+
+  //apply keystream to interleave
+  for (int8_t i = 0; i < 72; i++)
+    interleaved[i] ^= ks[71-i];
+
+  //deinterleave back into ambe_fr frame
+  w = rW; x = rX; y = rY; z = rZ;
+  int k = 0;
+  for (int8_t i = 0; i < 36; i++)
+  {
+    ambe_fr[*w][*x] = interleaved[k++];
+    ambe_fr[*y][*z] = interleaved[k++];
+
+    w++;
+    x++;
+    y++;
+    z++;
+  }
+
+}
--- a/src/dmr_34.c
+++ b/src/dmr_34.c
@@ -20,8 +20,8 @@ uint8_t constellation_map[16] = {
 };

 //digitized dibit to OTA symbol conversion for reference
-//0 = +1; 1 = +3; 
-//2 = -1; 3 = -3; 
+//0 = +1; 1 = +3;
+//2 = -1; 3 = -3;

 //finite state machine values
 uint8_t fsm[64] = {
@@ -81,7 +81,7 @@ uint8_t fix_34(uint8_t * p, uint8_t state, int position)
            counter++;
            break;
          }
-          
+
        }

        if (counter > best_p)
@@ -139,12 +139,12 @@ uint32_t dmr_34(uint8_t * input, uint8_t treturn[18])
  uint8_t point[49];
  memset (point, 0xFF, sizeof(point));

-  for (i = 0; i < 49; i++) 
+  for (i = 0; i < 49; i++)
    point[i] = constellation_map[nibs[i]];

  //debug view points
  // fprintf (stderr, "\n P =");
-  // for (i = 0; i < 49; i++) 
+  // for (i = 0; i < 49; i++)
  //   fprintf (stderr, " %02d", point[i]);

  //convert constellation points into tribit values using the FSM
@@ -181,14 +181,14 @@ uint32_t dmr_34(uint8_t * input, uint8_t treturn[18])

      //decrement one and resume decoding
      i--;
-     
+
    }

  }

  //debug view tribits/states
  // fprintf (stderr, "\n T =");
-  // for (i = 0; i < 49; i++) 
+  // for (i = 0; i < 49; i++)
  //   fprintf (stderr, " %02d", tribits[i]);

  //convert tribits into a return payload
@@ -197,7 +197,7 @@ uint32_t dmr_34(uint8_t * input, uint8_t treturn[18])
  //break into chunks of 24 bit values and shuffle into 8-bit (byte) treturn values
  for (i = 0; i < 6; i++)
  {
-    temp = (tribits[(i*8)+0] << 21) + (tribits[(i*8)+1] << 18) + (tribits[(i*8)+2] << 15) + (tribits[(i*8)+3] << 12) + 
+    temp = (tribits[(i*8)+0] << 21) + (tribits[(i*8)+1] << 18) + (tribits[(i*8)+2] << 15) + (tribits[(i*8)+3] << 12) +
            (tribits[(i*8)+4] << 9) + (tribits[(i*8)+5] << 6)  + (tribits[(i*8)+6] << 3)  + (tribits[(i*8)+7] << 0);

    treturn[(i*3)+0] = (temp >> 16) & 0xFF;
--- a/src/dmr_block.c
+++ b/src/dmr_block.c
--- a/src/dmr_bs.c
+++ b/src/dmr_bs.c
@@ -9,12 +9,14 @@
 #include "dsd.h"
 #include "dmr_const.h"

+// #define PRINT_AMBE72 //enable to view 72-bit AMBE codewords
+
 //A subroutine for processing each TDMA frame individually to allow for
 //processing voice and/or data on both BS slots (channels) simultaneously
 void dmrBS (dsd_opts * opts, dsd_state * state)
 {
  char * timestr = NULL;
-  
+
  int i, dibit;
  char ambe_fr[4][24];
  char ambe_fr2[4][24];
@@ -28,7 +30,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
  uint8_t m1[4][24];
  uint8_t m2[4][24];
  uint8_t m3[4][24];
-  
+
  const int *w, *x, *y, *z;
  char sync[25];
  uint8_t syncdata[48];
@@ -51,11 +53,11 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
  uint8_t power = 9; //power and pre-emption indicator
  uint8_t lcss = 9;
  UNUSED2(cc, lcss);
-  
+
  //would be ideal to grab all dibits and break them into bits to pass to new data handler?
-  uint8_t dummy_bits[196]; 
+  uint8_t dummy_bits[196];
  memset (dummy_bits, 0, sizeof(dummy_bits));
-  
+
  //Init slot lights
  sprintf (state->slot1light, " slot1 ");
  sprintf (state->slot2light, " slot2 ");
@@ -86,7 +88,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
   11, 12, 2, 13, 14,
   15, 3, 16, 4, 17, 18,
   19, 5, 20, 21, 22, 6, 23
-  }; 
+  };

  //cach tact bits
  uint8_t tact_bits[7];
@@ -265,7 +267,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
  //check for sync pattern here after collected the rest of the payload, decide what to do with it
  if ( strcmp (sync, DMR_BS_DATA_SYNC) == 0 )
  {
-    
+
    fprintf (stderr,"%s ", timestr);
    if (internalslot == 0)
    {
@@ -274,11 +276,11 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
        fprintf (stderr,"Sync: +DMR  ");
      }
      else fprintf (stderr,"Sync: -DMR  ");
-      
+
      vc1 = 7; //set to 7 so we can see that we should not be on a VC unless a framesync comes in for it first

      //close MBEout file - slot 1
-      if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state); 
+      if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
    }
    if (internalslot == 1)
    {
@@ -303,30 +305,65 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
  //check for a rc burst with bptc or 34 rate data in it (testing only)
  // #define RC_TESTING //disable if not in use
  #ifdef RC_TESTING
-  if ( (strcmp (sync, DMR_BS_DATA_SYNC) != 0) && (strcmp (sync, DMR_BS_VOICE_SYNC) != 0) && 
-       ( (internalslot == 0 && vc1 == 6) ||  (internalslot == 1 && vc2 == 6) )              )
+
+  //skip the vc counter, just look at the QR and P/Pi if not voice or data sync pattern
+  if ( (strcmp (sync, DMR_BS_DATA_SYNC) != 0) && (strcmp (sync, DMR_BS_VOICE_SYNC) != 0) )
  {

-    //if the QR FEC is good, and the P/PI bit is on for RC
-    if (QR_16_7_6_decode(emb_pdu) && emb_pdu[4])
+    //Golay_20_8_decode FEC for the burst type (SlotType)
+    unsigned char SlotType[20];
+    memset (SlotType, 0, sizeof(SlotType));
+    uint8_t k = 61;
+    for (uint8_t i = 0; i < 5; i++)
    {
-      fprintf (stderr,"%s ", timestr);
+      SlotType[(i*2)+0] = (state->dmr_stereo_payload[k+0] >> 1) & 1;
+      SlotType[(i*2)+1] = (state->dmr_stereo_payload[k++] >> 0) & 1;
+    }
+    k = 90;
+    for (uint8_t i = 0; i < 5; i++)
+    {
+      SlotType[(i*2)+10] = (state->dmr_stereo_payload[k+0] >> 1) & 1;
+      SlotType[(i*2)+11] = (state->dmr_stereo_payload[k++] >> 0) & 1;
+    }

-      if (opts->inverted_dmr == 0)
-        fprintf (stderr,"Sync: +RC   ");
-      else fprintf (stderr,"Sync: -RC   ");
+    //if the QR FEC is good, tact/cach FEC is good, and slot type burst FEC is good, and the P/PI bit is on for RC
+    //NOTE: This can still trigger on bad signal when it should be a data sync pattern but signal drops out or
+    //occassionally on p_clear with trunking tuner logic active and partial stale dibits in the buffer
+    if (QR_16_7_6_decode(emb_pdu) && emb_pdu[4] && tact_okay == 1) //during voice test
+    {

-      dmr_data_sync (opts, state);
+      if (Golay_20_8_decode(SlotType))
+      {
+        fprintf (stderr,"%s ", timestr);
+        if (opts->inverted_dmr == 0)
+          fprintf (stderr,"Sync: +RC   ");
+        else fprintf (stderr,"Sync: -RC   ");

-      dmr_data_burst_handler(opts, state, (uint8_t *)dummy_bits, 0xEB);
+        dmr_data_sync (opts, state);
+      }
+
+      for (i = 0; i < 48; i++)
+        state->dmr_embedded_signalling[internalslot][5][i] = syncdata[i];

      dmr_sbrc (opts, state, emb_pdu[4]);

-      if (internalslot == 0)
-        vc1 = 7;
-      else vc2 = 7;
+      emb_ok = 1;

-      goto SKIP;
+      //give an audio cue when this happens (low, high)
+      beeper (opts, state, internalslot, 40, 86, 3);
+      beeper (opts, state, internalslot, 80, 86, 3);
+
+      //put into Event History
+      state->event_history_s[0].Event_History_Items[internalslot].color_pair = 4;
+      watchdog_event_datacall (opts, state, 0, 0, "DMR Reverse Channel P/PI Indicator On (FEC Okay);", internalslot);
+      push_event_history (&state->event_history_s[internalslot]);
+      init_event_history (&state->event_history_s[internalslot], 0, 1);
+
+      if (Golay_20_8_decode(SlotType))
+      {
+        skipcount++;
+        goto SKIP;
+      }

    }

@@ -376,10 +413,10 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
  }

  //only play voice on no data sync, and VC values are within expected values 1-6
-  if (strcmp (sync, DMR_BS_DATA_SYNC) != 0) //we already have a tact ecc check, so we won't get here without that, see if there is any other eccs we can run just to make sure 
+  if (strcmp (sync, DMR_BS_DATA_SYNC) != 0) //we already have a tact ecc check, so we won't get here without that, see if there is any other eccs we can run just to make sure
  {

-    //check the embedded signalling, if bad at this point, we probably aren't quite in sync 
+    //check the embedded signalling, if bad at this point, we probably aren't quite in sync
    if(QR_16_7_6_decode(emb_pdu)) emb_ok = 1;
    else emb_ok = 0;

@@ -408,7 +445,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
      sprintf (light, "%s", " [SLOT1]  slot2  ");
      //open MBEout file - slot 1
      if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL)) openMbeOutFile (opts, state);
-    } 
+    }
    else
    {
      state->dmrburstR = 16;
@@ -416,15 +453,18 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
      sprintf (light, "%s", "  slot1  [SLOT2] ");
      //open MBEout file - slot 2
      if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_fR == NULL)) openMbeOutFileR (opts, state);
-    } 
+    }
    if (opts->inverted_dmr == 0) sprintf (polarity, "%s", "+");
    else sprintf (polarity, "%s", "-");
    if (state->dmr_color_code != 16)
      fprintf (stderr,"Sync: %sDMR %s| Color Code=%02d | VC%d ", polarity, light, state->dmr_color_code, vc);
    else fprintf (stderr,"Sync: %sDMR %s| Color Code=XX | VC%d ", polarity, light, vc);
- 
-    if (internalslot == 0 && vc1 == 6) 
+
+    if (internalslot == 0 && vc1 == 6)
    {
+      //this needs to run prior to embedded link control
+      if (state->payload_algid == 0x02)
+        hytera_enhanced_alg_refresh(state);
      //process embedded link control
      fprintf (stderr, "\n");
      dmr_data_burst_handler(opts, state, (uint8_t *)dummy_bits, 0xEB);
@@ -433,8 +473,11 @@ void dmrBS (dsd_opts * opts, dsd_state * state)

    }

-    if (internalslot == 1 && vc2 == 6) 
+    if (internalslot == 1 && vc2 == 6)
    {
+      //this needs to run prior to embedded link control
+      if (state->payload_algidR == 0x02)
+        hytera_enhanced_alg_refresh(state);
      //process embedded link control
      fprintf (stderr, "\n");
      dmr_data_burst_handler(opts, state, (uint8_t *)dummy_bits, 0xEB);
@@ -445,13 +488,33 @@ void dmrBS (dsd_opts * opts, dsd_state * state)

    if (opts->payload == 1) fprintf (stderr, "\n"); //extra line break necessary here

-    //copy ambe_fr frames first, running process mbe will correct them, 
-    //but this also leads to issues extracting good le mi values when 
+    //copy ambe_fr frames first, running process mbe will correct them,
+    //but this also leads to issues extracting good le mi values when
    //we go to do correction on them there too
    memcpy (m1, ambe_fr, sizeof(m1));
    memcpy (m2, ambe_fr2, sizeof(m2));
    memcpy (m3, ambe_fr3, sizeof(m3));

+    if (state->tyt_bp == 1)
+    {
+      tyt16_ambe2_codeword_keystream(state, ambe_fr, 0);
+      tyt16_ambe2_codeword_keystream(state, ambe_fr2, 1);
+      tyt16_ambe2_codeword_keystream(state, ambe_fr3, 0);
+    }
+
+    if (state->csi_ee == 1)
+    {
+      csi72_ambe2_codeword_keystream(state, ambe_fr);
+      csi72_ambe2_codeword_keystream(state, ambe_fr2);
+      csi72_ambe2_codeword_keystream(state, ambe_fr3);
+    }
+
+    #ifdef PRINT_AMBE72
+    ambe2_codeword_print_i(opts, ambe_fr);
+    ambe2_codeword_print_i(opts, ambe_fr2);
+    ambe2_codeword_print_i(opts, ambe_fr3);
+    #endif
+
    processMbeFrame (opts, state, NULL, ambe_fr, NULL);
    if(internalslot == 0)
    {
@@ -459,15 +522,15 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
      memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
      memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
    }
-      
+
    else
    {
      memcpy(state->f_r4[0], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
      memcpy(state->s_r4[0], state->s_r, sizeof(state->s_r));
      memcpy(state->s_r4u[0], state->s_ru, sizeof(state->s_ru));
    }
-      
-    
+
+
    processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
    if(internalslot == 0)
    {
@@ -475,7 +538,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
      memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
      memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
    }
-      
+
    else
    {
      memcpy(state->f_r4[1], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
@@ -490,7 +553,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
      memcpy(state->s_l4[2], state->s_l, sizeof(state->s_l));
      memcpy(state->s_l4u[2], state->s_lu, sizeof(state->s_lu));
    }
-      
+
    else
    {
      memcpy(state->f_r4[2], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
@@ -523,14 +586,18 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
    if (internalslot == 0 && vc1 == 6) dmr_sbrc (opts, state, power);
    if (internalslot == 1 && vc2 == 6) dmr_sbrc (opts, state, power);

-    cach_err = dmr_cach (opts, state, cachdata); 
+    cach_err = dmr_cach (opts, state, cachdata);
    if (opts->payload == 0) fprintf (stderr, "\n");

    // run alg refresh after vc6 ambe processing
    if (internalslot == 0 && vc1 == 6) dmr_alg_refresh (opts, state);
    if (internalslot == 1 && vc2 == 6) dmr_alg_refresh (opts, state);

-    dmr_late_entry_mi_fragment (opts, state, vc%7, m1, m2, m3);
+    if (internalslot == 0 && vc1 == 6) state->static_ks_counter[0] = 0;
+    if (internalslot == 1 && vc2 == 6) state->static_ks_counter[1] = 0;
+
+    if (opts->dmr_le != 2) //if not Hytera Enhanced
+      dmr_late_entry_mi_fragment (opts, state, vc%7, m1, m2, m3);

    //increment the vc counters
    if (internalslot == 0) vc1++;
@@ -547,7 +614,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
    cach_err = 1;
    tact_okay = 0;
    emb_ok = 0;
-    
+
    //reset emb components
    cc = 25;
    power = 9;
@@ -570,7 +637,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)

  if (skipcount > 3) //after 3 onsecutive data frames, drop back to getFrameSync and process with dmr_data_sync (need one more in order to push last voice on slot 2 only voice)
  {
-    //set tests to all good so we don't get a bogus/redundant voice error 
+    //set tests to all good so we don't get a bogus/redundant voice error
    cach_err = 0;
    tact_okay = 1;
    emb_ok = 1;
@@ -583,6 +650,14 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
    ncursesPrinter(opts, state);
  }

+  //slot 1
+  watchdog_event_history(opts, state, 0);
+  watchdog_event_current(opts, state, 0);
+
+  //slot 2 for TDMA systems
+  watchdog_event_history(opts, state, 1);
+  watchdog_event_current(opts, state, 1);
+
  //
  if (timestr != NULL)
  {
@@ -625,24 +700,40 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
    state->currentslot = 0;
    dmr_alg_refresh (opts, state);
  }
-  if (state->payload_algidR >= 0x21) 
+  else if (state->payload_algid == 0x02)
+  {
+    hytera_enhanced_alg_refresh(state);
+    state->currentslot = 0;
+    dmr_alg_refresh (opts, state);
+  }
+  if (state->payload_algidR >= 0x21)
  {
    state->currentslot = 1;
    dmr_alg_refresh (opts, state);
  }
-    
+  else if (state->payload_algidR == 0x02)
+  {
+    hytera_enhanced_alg_refresh(state);
+    state->currentslot = 1;
+    dmr_alg_refresh (opts, state);
+  }
+
  //failsafe to reset all data header and blocks when bad tact or emb
-  dmr_reset_blocks (opts, state); 
-   
+  dmr_reset_blocks (opts, state);
+
 }

 //
- if (timestr != NULL)
+  if (timestr != NULL)
  {
    free (timestr);
    timestr = NULL;
  }

+  //reset static ks counter
+  state->static_ks_counter[0] = 0;
+  state->static_ks_counter[1] = 0;
+
 }

 //Process buffered half frame and 2nd half and then jump to full BS decoding
@@ -713,6 +804,9 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)

  internalslot = state->currentslot = tact_bits[1];

+  //reset static ks counter
+  state->static_ks_counter[internalslot] = 0;
+
  //Setup for first AMBE Frame

  //Interleave Schedule
@@ -838,13 +932,13 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
    sprintf (light, "%s", " [SLOT1]  slot2  ");
    //open MBEout file - slot 1
    if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL)) openMbeOutFile (opts, state);
-  } 
+  }
  else
  {
    sprintf (light, "%s", "  slot1  [SLOT2] ");
    //open MBEout file - slot 2
    if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_fR == NULL)) openMbeOutFileR (opts, state);
-  } 
+  }
  if (opts->inverted_dmr == 0) sprintf (polarity, "%s", "+");
  else sprintf (polarity, "%s", "-");
  if (state->dmr_color_code != 16)
@@ -853,13 +947,33 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)

  dmr_alg_reset (opts, state);

-  //copy ambe_fr frames first, running process mbe will correct them, 
-  //but this also leads to issues extracting good le mi values when 
+  //copy ambe_fr frames first, running process mbe will correct them,
+  //but this also leads to issues extracting good le mi values when
  //we go to do correction on them there too
  memcpy (m1, ambe_fr, sizeof(m1));
  memcpy (m2, ambe_fr2, sizeof(m2));
  memcpy (m3, ambe_fr3, sizeof(m3));

+  if (state->tyt_bp == 1)
+  {
+    tyt16_ambe2_codeword_keystream(state, ambe_fr, 0);
+    tyt16_ambe2_codeword_keystream(state, ambe_fr2, 1);
+    tyt16_ambe2_codeword_keystream(state, ambe_fr3, 0);
+  }
+
+  if (state->csi_ee == 1)
+  {
+    csi72_ambe2_codeword_keystream(state, ambe_fr);
+    csi72_ambe2_codeword_keystream(state, ambe_fr2);
+    csi72_ambe2_codeword_keystream(state, ambe_fr3);
+  }
+
+  #ifdef PRINT_AMBE72
+  ambe2_codeword_print_i(opts, ambe_fr);
+  ambe2_codeword_print_i(opts, ambe_fr2);
+  ambe2_codeword_print_i(opts, ambe_fr3);
+  #endif
+
  if (opts->payload == 1) fprintf (stderr, "\n"); //extra line break necessary here
  // processMbeFrame (opts, state, NULL, ambe_fr, NULL);
  // processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
@@ -872,14 +986,14 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
    memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
    memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
  }
-    
+
  else
  {
    memcpy(state->f_r4[0], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
    memcpy(state->s_r4[0], state->s_r, sizeof(state->s_r));
    memcpy(state->s_r4u[0], state->s_ru, sizeof(state->s_ru));
  }
-    
+

  processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
  if(internalslot == 0)
@@ -888,7 +1002,7 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
    memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
    memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
  }
-    
+
  else
  {
    memcpy(state->f_r4[1], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
@@ -903,7 +1017,7 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
    memcpy(state->s_l4[2], state->s_l, sizeof(state->s_l));
    memcpy(state->s_l4u[2], state->s_lu, sizeof(state->s_lu));
  }
-    
+
  else
  {
    memcpy(state->f_r4[2], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
@@ -912,7 +1026,8 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
  }

  //collect the mi fragment
-  dmr_late_entry_mi_fragment (opts, state, 1, m1, m2, m3);
+  if (opts->dmr_le != 2) //if not Hytera Enhanced
+    dmr_late_entry_mi_fragment (opts, state, 1, m1, m2, m3);

  cach_err = dmr_cach (opts, state, cachdata);
  if (opts->payload == 0) fprintf (stderr, "\n");
@@ -943,14 +1058,26 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
      state->currentslot = 0;
      dmr_alg_refresh (opts, state);
    }
-    if (state->payload_algidR >= 0x21) 
+    else if (state->payload_algid == 0x02)
+    {
+      state->currentslot = 0;
+      hytera_enhanced_alg_refresh(state);
+      dmr_alg_refresh (opts, state);
+    }
+    if (state->payload_algidR >= 0x21)
    {
      state->currentslot = 1;
      dmr_alg_refresh (opts, state);
    }
-    
+    else if (state->payload_algid == 0x02)
+    {
+      hytera_enhanced_alg_refresh(state);
+      state->currentslot = 1;
+      dmr_alg_refresh (opts, state);
+    }
+
    //failsafe to reset all data header and blocks when bad tact or emb
-    dmr_reset_blocks (opts, state); 
+    dmr_reset_blocks (opts, state);
  }

  if (timestr != NULL)
--- a/src/dmr_csbk.c
+++ b/src/dmr_csbk.c
--- a/src/dmr_data.c
+++ b/src/dmr_data.c
@@ -30,12 +30,12 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)

  uint8_t burst;
  char info[196];
-  unsigned char SlotType[20]; 
+  unsigned char SlotType[20];
  unsigned int SlotTypeOk;
  uint8_t cach_err = 0;
  UNUSED(cach_err);

-  int cachInterleave[24] = 
+  int cachInterleave[24] =
  {0, 7, 8, 9, 1, 10,
   11, 12, 2, 13, 14,
   15, 3, 16, 4, 17, 18,
@@ -43,7 +43,7 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
  };

  dibit_p = state->dmr_payload_p - 90;
-  
+
  //collect cach and de-interleave
  for (i = 0; i < 12; i++)
  {
@@ -116,7 +116,7 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
  }
  if (state->dmr_stereo == 1)
  {
-    dibit = (int)state->dmr_stereo_payload[61]; 
+    dibit = (int)state->dmr_stereo_payload[61];
  }
  else state->dmr_stereo_payload[61] = dibit;

@@ -146,7 +146,7 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
  }
  if (state->dmr_stereo == 1) //state
  {
-    dibit = (int)state->dmr_stereo_payload[63]; 
+    dibit = (int)state->dmr_stereo_payload[63];
  }
  else state->dmr_stereo_payload[63] = dibit;

@@ -161,7 +161,7 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
  }
  if (state->dmr_stereo == 1) //state
  {
-    dibit = (int)state->dmr_stereo_payload[64]; 
+    dibit = (int)state->dmr_stereo_payload[64];
  }
  else state->dmr_stereo_payload[64] = dibit;

@@ -194,7 +194,7 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
    }
    if (state->dmr_stereo == 1)
    {
-      dibit = (int)state->dmr_stereo_payload[i+66]; 
+      dibit = (int)state->dmr_stereo_payload[i+66];
    }
    else state->dmr_stereo_payload[i+66] = dibit;

@@ -202,7 +202,7 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
    syncdata[(2*i)+1] = (1 & dibit);         // bit 0
    sync[i] = (dibit | 1) + 48;
  }
-  sync[24] = 0; 
+  sync[24] = 0;

  if((strcmp (sync, DMR_BS_DATA_SYNC) == 0) )
  {
@@ -240,21 +240,21 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
  // Slot type - Second part - Parity bit
  for (i = 0; i < 5; i++)
  {
-    if (state->dmr_stereo == 0) 
+    if (state->dmr_stereo == 0)
    {
      dibit = getDibit(opts, state);
      state->dmr_stereo_payload[i+90] = dibit;
    }
    if (state->dmr_stereo == 1)
    {
-      dibit = (int)state->dmr_stereo_payload[i+90]; 
+      dibit = (int)state->dmr_stereo_payload[i+90];
    }
    SlotType[(i*2) + 10] = (1 & (dibit >> 1)); // bit 1
    SlotType[(i*2) + 11] = (1 & dibit);        // bit 0
  }

  /* Check and correct the SlotType (apply Golay(20,8) FEC check) */
-  
+
  // golay (20,8) hamming-weight of 6 reliably corrects at most 2 bit-errors
  if( Golay_20_8_decode(SlotType) ) SlotTypeOk = 1;
  else
@@ -278,7 +278,7 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
  // Current slot - Second Half - Data Payload - 2nd part
  for (i = 0; i < 49; i++)
  {
-    if (state->dmr_stereo == 0) 
+    if (state->dmr_stereo == 0)
    {
      dibit = getDibit(opts, state);
      state->dmr_stereo_payload[i+95] = dibit;
@@ -286,13 +286,13 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)

    if (state->dmr_stereo == 1)
    {
-      dibit = (int)state->dmr_stereo_payload[i+95]; 
+      dibit = (int)state->dmr_stereo_payload[i+95];
    }

    info[(2*i) + 98] = (1 & (dibit >> 1));  // bit 1
    info[(2*i) + 99] = (1 & dibit);         // bit 0
  }
-  
+
  //
  dmr_data_burst_handler(opts, state, (uint8_t *)info, burst);

@@ -300,7 +300,7 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
  if (state->dmr_ms_mode == 0 && opts->dmr_mono == 0)
  {
    cach_err = dmr_cach (opts, state, cachdata);
-  } 
+  }

  //ending line break
  fprintf(stderr, "\n");
@@ -316,7 +316,7 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
  }

  // Skip cach (24 bit = 12 dibit) and next slot 1st half (98 + 10 bit = 49 + 5 dibit)
-  if (state->dmr_stereo == 0) 
+  if (state->dmr_stereo == 0)
  {
    skipDibit (opts, state, 12 + 49 + 5);
  }
@@ -325,7 +325,7 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)

  #ifdef CON_TUNEAWAY
  //simplified, if IDLE condition, drop cc and vc sync time so when RF channel tears down, we go back much quicker
-  //NOTE: This was adopted, because going back to the CC early and then to be sent back to the channel grant, 
+  //NOTE: This was adopted, because going back to the CC early and then to be sent back to the channel grant,
  //only for it to tear down and being sent back to the CC again isn't very efficient for trunk tracking
  //NOTE: This will still leave the tuner in the 'locked' state when tuning a voice channel grant on the CC,
  //and will remain locked until a new voice channel grant is received, but its just asthetic, trying to fix it
@@ -342,4 +342,4 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
    }
  }
  #endif
-} 
+}
--- a/src/dmr_dburst.c
+++ b/src/dmr_dburst.c
@@ -11,13 +11,10 @@

 //TODO: Test USBD LIP Decoder with Real World Samples (if/when available)
 //TODO: Test UDT NMEA and LIP Decoders with Real World Samples (if/when available)
-//WIP:  Move all extra decoders for location, etc, to a new file and add prototypes to dsd.h  
-//TODO: Test CRC9/CRC32 on Rate 1 Data with Real World Samples (if/when available)
-//TODO: Address areas that require reading of ISO7, ISO8, and UTF-16 string formats

 #include "dsd.h"

-void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196], uint8_t databurst) 
+void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196], uint8_t databurst)
 {

  uint32_t i, j, k;
@@ -27,7 +24,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
  uint32_t IrrecoverableErrors = 0;
  uint8_t slot = state->currentslot;

-  //confirmed data 
+  //confirmed data
  uint8_t dbsn = 0; //data block serial number for confirmed data blocks
  uint8_t blockcounter = 0; //local block count
  uint8_t confdatabits[250]; //array to reshuffle conf data block bits into sequence for crc9 check
@@ -53,8 +50,8 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
  memset (LC_DataBytes, 0, sizeof(LC_DataBytes));

  //PDU Bytes and Bits
-  uint8_t  DMR_PDU[25]; 
-  uint8_t  DMR_PDU_bits[196]; 
+  uint8_t  DMR_PDU[25];
+  uint8_t  DMR_PDU_bits[196];
  memset (DMR_PDU, 0, sizeof (DMR_PDU));
  memset (DMR_PDU_bits, 0, sizeof (DMR_PDU_bits));

@@ -63,19 +60,19 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
  uint8_t  is_ras = 0;
  uint8_t  crc_original_validity = 0;

-  uint32_t crcmask = 0; 
+  uint32_t crcmask = 0;
  uint8_t  crclen = 0;

  uint8_t is_bptc = 0;
-  uint8_t is_trellis = 0; 
+  uint8_t is_trellis = 0;
  uint8_t is_emb = 0;
-  uint8_t is_lc = 0;  
+  uint8_t is_lc = 0;
  uint8_t is_full = 0;
-  uint8_t is_udt = 0; 
+  uint8_t is_udt = 0;
  uint8_t pdu_len = 0;
  uint8_t pdu_start = 0; //starting value of pdu (0 normal, 2 for confirmed)

-  uint8_t usbd_st = 0; //usbd service type 
+  uint8_t usbd_st = 0; //usbd service type

  switch(databurst){
    case 0x00: //PI
@@ -89,14 +86,14 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
      is_bptc = 1;
      is_lc = 1;
      crclen = 24;
-      crcmask = 0x969696; 
+      crcmask = 0x969696;
      pdu_len = 12; //12 bytes
      sprintf(state->fsubtype, " VLC ");
      break;
    case 0x02: //TLC
      is_bptc = 1;
      is_lc = 1;
-      crcmask = 0x999999; 
+      crcmask = 0x999999;
      crclen = 24;
      pdu_len = 12; //12 bytes
      sprintf(state->fsubtype, " TLC ");
@@ -104,7 +101,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
    case 0x03: //CSBK
      is_bptc = 1;
      crclen = 16;
-      crcmask = 0xA5A5; 
+      crcmask = 0xA5A5;
      pdu_len = 12; //12 bytes
      sprintf(state->fsubtype, " CSBK");
      break;
@@ -131,19 +128,21 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
    case 0x07: //1/2 Rate Data
      is_bptc = 1;
      crclen = 9; //confirmed data only
-      crcmask = 0x0F0; 
+      crcmask = 0x0F0;
      pdu_len = 12; //12 bytes unconfirmed
      sprintf(state->fsubtype, " R12U ");
      if (state->data_conf_data[slot] == 1)
      {
-        pdu_len = 10; 
+        pdu_len = 10;
        pdu_start = 2; //start at plus two when assembling
        sprintf(state->fsubtype, " R12C ");
      }
      if (state->data_header_format[slot] == 0) //UDT 1/2 Encoded Blocks
      {
-        is_udt = 1; 
-        sprintf(state->fsubtype, " UDTC ");
+        is_udt = 1;
+        if (state->data_conf_data[slot] == 1)
+          sprintf(state->fsubtype, " UDTC "); //confirmed data
+        else sprintf(state->fsubtype, " UDTU "); //unconfirmed data
      }
      break;
    case 0x08: //3/4 Rate Data
@@ -154,10 +153,10 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
      sprintf(state->fsubtype, " R34U ");
      if (state->data_conf_data[slot] == 1)
      {
-        pdu_len = 16; 
+        pdu_len = 16;
        pdu_start = 2; //start at plus two when assembling
        sprintf(state->fsubtype, " R34C ");
-      } 
+      }
      break;
    case 0x09: //Idle
      //pseudo-random data fill, no need to do anything with this
@@ -165,16 +164,16 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
      break;
    case 0x0A: //1 Rate Data
      crclen = 9; //confirmed data only
-      crcmask = 0x10F; 
+      crcmask = 0x10F;
      is_full = 1;
-      pdu_len = 25; //196 bits - 24.5 bytes
+      pdu_len = 24; //192 bits 24 bytes + 4 pad bits
      sprintf(state->fsubtype, " R_1U ");
      if (state->data_conf_data[slot] == 1)
      {
-        pdu_len = 23; 
+        pdu_len = 22; //start at plus two when assembling
        pdu_start = 2; //start at plus two when assembling
        sprintf(state->fsubtype, " R_1C ");
-      }  
+      }
      break;
    case 0x0B: //Unified Single Block Data USBD
      is_bptc = 1;
@@ -183,7 +182,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
      pdu_len = 12; //12 bytes
      sprintf(state->fsubtype, " USBD ");
      break;
-      
+
    //special types (not real data 'sync' bursts)
    case 0xEB: //Embedded Signalling
      crclen = 5;
@@ -194,12 +193,12 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
    default:
      //Slot Type FEC should catch this so we never see it,
      //but if it doesn't, then we can still dump the entire 'packet'
-      //treat like rate 1 unconfirmed data 
+      //treat like rate 1 unconfirmed data
      is_full = 1;
-      pdu_len = 25; //196 bits - 24.5 bytes 
-      sprintf(state->fsubtype, " _UNK "); 
+      pdu_len = 25; //196 bits - 24.5 bytes
+      sprintf(state->fsubtype, " _UNK ");
      break;
-    
+
  }

  //flag off prop head when not looking at data blocks
@@ -208,7 +207,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
  if (databurst != 0xEB)
  {
    if (state->dmr_ms_mode == 0)
-    { 
+    {
      if (state->dmr_color_code != 16)
        fprintf(stderr, "| Color Code=%02d ", state->dmr_color_code);
      else fprintf(stderr, "| Color Code=XX ");
@@ -235,7 +234,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
      fclose (pFile);
    }
  }
-  
+
  //Most Data Sync Burst types will use the bptc 196x96
  if (is_bptc)
  {
@@ -253,7 +252,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
    BPTCReservedBits = (R[0] & 0x01) | ((R[1] << 1) & 0x02) | ((R[2] << 2) & 0x04);

    //debug print
-    //fprintf (stderr, " RAS? %X - %d %d %d", BPTCReservedBits, R[0], R[1], R[2]); 
+    //fprintf (stderr, " RAS? %X - %d %d %d", BPTCReservedBits, R[0], R[1], R[2]);

    /* Convert the 96 bits BPTC data into 12 bytes */
    k = 0;
@@ -270,16 +269,16 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196

    /* Fill the CRC extracted (before Reed-Solomon (12,9) FEC correction) */
    CRCExtracted = 0;
-    for(i = 0; i < crclen; i++) 
+    for(i = 0; i < crclen; i++)
    {
      CRCExtracted = CRCExtracted << 1;
-      CRCExtracted = CRCExtracted | (uint32_t)(BPTCDmrDataBit[i + 96 - crclen] & 1); 
+      CRCExtracted = CRCExtracted | (uint32_t)(BPTCDmrDataBit[i + 96 - crclen] & 1);
    }

    /* Apply the CRC mask (see DMR standard B.3.12 Data Type CRC Mask) */
    CRCExtracted = CRCExtracted ^ crcmask;

-    /* Check/correct the BPTC data and compute the Reed-Solomon (12,9) CRC */ 
+    /* Check/correct the BPTC data and compute the Reed-Solomon (12,9) CRC */
    if (is_lc) CRCCorrect = ComputeAndCorrectFullLinkControlCrc(BPTCDmrDataByte, &CRCComputed, crcmask);

    //set CRC to correct on unconfirmed 1/2 data blocks (for reporting due to no CRC available on these)
@@ -288,7 +287,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
      CRCComputed = 0;
      CRCExtracted = 0;
      CRCCorrect = 1;
-    } 
+    }

    //run CRC9 on intermediate and last 1/2 confirmed data blocks
    else if (state->data_conf_data[slot] == 1 && databurst == 0x7)
@@ -308,32 +307,32 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
      {
        CRCCorrect = 1;
        state->data_block_crc_valid[slot][blockcounter] = 1;
-      } 
+      }
      else state->data_block_crc_valid[slot][blockcounter] = 0;

    }

    //run CCITT on other data forms
-    else 
+    else
    {
-      CRCComputed = ComputeCrcCCITT(BPTCDmrDataBit); 
+      CRCComputed = ComputeCrcCCITT(BPTCDmrDataBit);
      if (CRCComputed == CRCExtracted) CRCCorrect = 1;
      else CRCCorrect = 0;
    }

    //set the 'RAS Flag', if no irrecoverable errors but bad crc, only when enabled by user (to prevent a lot of bad data CSBKs)
-    if (opts->aggressive_framesync == 0 && CRCCorrect == 0 && IrrecoverableErrors == 0 && BPTCReservedBits == 4) is_ras = 1; 
+    if (opts->aggressive_framesync == 0 && CRCCorrect == 0 && IrrecoverableErrors == 0 && BPTCReservedBits == 4) is_ras = 1;

    //make sure the system type isn't Hytera, but could just be bad decodes on bad sample
    if (BPTCDmrDataByte[1] == 0x68) is_ras = 0;

    //if this is a RAS system, set the CRC to okay if irrecoverable errors are okay
-    //if we don't do this, then we can't view some data (CSBKs on RAS enabled systems) 
+    //if we don't do this, then we can't view some data (CSBKs on RAS enabled systems)
    if (is_ras == 1)
    {
      crc_original_validity = CRCCorrect;
      CRCCorrect = 1;
-    } 
+    }

    if (databurst == 0x04 || databurst == 0x06) //MBC Header, Data Header
    {
@@ -343,7 +342,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
      }
      else state->data_block_crc_valid[slot][0] = 0;
    }
-    
+
    /* Convert corrected x bytes into x*8 bits */
    for(i = 0, j = 0; i < pdu_len; i++, j+=8)
    {
@@ -373,7 +372,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
  //Embedded Signalling will use BPTC 128x77
  if (is_emb)
  {
-    
+
    CRCExtracted = 0;
    CRCComputed = 0;
    IrrecoverableErrors = 0;
@@ -410,7 +409,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196

    if(CRCExtracted == CRCComputed) CRCCorrect = 1;
    else CRCCorrect = 0;
-      
+
    for (i = 0; i < 72; i++)
    {
      DMR_PDU_bits[i] = LC_DataBit[i];
@@ -428,14 +427,14 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
  {
    CRCExtracted = 0;
    CRCComputed = 0;
-    IrrecoverableErrors = 1; 
+    IrrecoverableErrors = 1;

    uint8_t tdibits[98];
    memset (tdibits, 0, sizeof(tdibits));

    //reconstitute info bits into dibits for the trellis decoder
    for (i = 0; i < 98; i++)
-      tdibits[i] = (info[i*2] << 1) | info[i*2+1]; 
+      tdibits[i] = (info[i*2] << 1) | info[i*2+1];

    uint8_t TrellisReturn[18];
    memset (TrellisReturn, 0, sizeof(TrellisReturn));
@@ -445,7 +444,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
    //they may have been successfully corrected, the CRC will reveal as much

    for (i = 0; i < pdu_len; i++)
-      DMR_PDU[i] = TrellisReturn[i+pdu_start]; 
+      DMR_PDU[i] = TrellisReturn[i+pdu_start];

    for(i = 0, j = 0; i < 18; i++, j+=8)
    {
@@ -461,7 +460,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196

    //set CRC to correct on unconfirmed 3/4 data blocks (for reporting due to no CRC available on these)
    if (state->data_conf_data[slot] == 0) CRCCorrect = 1;
- 
+
    //run CRC9 on intermediate and last 3/4 data blocks
    else if (state->data_conf_data[slot] == 1)
    {
@@ -474,12 +473,12 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
      for(i = 0; i < 128; i++) confdatabits[i] = DMR_PDU_bits[i + 16];
      for(i = 0; i < 7; i++) confdatabits[i + 128] = DMR_PDU_bits[i];

-      CRCComputed = ComputeCrc9Bit(confdatabits, 135); 
+      CRCComputed = ComputeCrc9Bit(confdatabits, 135);
      if (CRCExtracted == CRCComputed)
      {
        CRCCorrect = 1;
        state->data_block_crc_valid[slot][blockcounter] = 1;
-      } 
+      }
      else
        state->data_block_crc_valid[slot][blockcounter] = 0;

@@ -504,20 +503,24 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196

  if (is_full) //Rate 1 Data
  {
+    //assembly (w/ confirmed data) on a working Tier III Tait System
+
    CRCExtracted = 0;
    CRCComputed = 0;
    IrrecoverableErrors = 0; //implicit, since there is no encoding

-    for (i = 0; i < 12; i++)
-      DMR_PDU[i] = (uint8_t)ConvertBitIntoBytes(&info[i*8], 8);
-
-    //Skip Padding Bits (96,97,98,99)
-    for (i = 0; i < 12; i++)
-      DMR_PDU[i+12] = (uint8_t)ConvertBitIntoBytes(&info[(i*8)+100], 8);
+    //pack rate 1 data for a total of up to 24 bytes, (22 if Confirmed Data)
+    //skipping the 4 padding bits located at 96,97,98,99 using the ptr values
+    //as offsets for confirmed data, len, and continue points for packing
+    int bit_ptr  = pdu_start * 8;
+    int byte_ptr = 0;
+    pack_bit_array_into_byte_array (info+bit_ptr, DMR_PDU+byte_ptr, 12-pdu_start);
+    bit_ptr = 100; byte_ptr = 12-pdu_start;
+    pack_bit_array_into_byte_array (info+bit_ptr, DMR_PDU+byte_ptr, 12);

    //set CRC to correct on unconfirmed 1 rate data blocks (for reporting due to no CRC available on these)
    if (state->data_conf_data[slot] == 0) CRCCorrect = 1;
- 
+
    //run CRC9 on intermediate and last 1 rate data blocks
    else if (state->data_conf_data[slot] == 1)
    {
@@ -527,18 +530,22 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
      CRCExtracted = CRCExtracted ^ crcmask;

      //reorganize the info bit array into confdatabits, just for CRC9 check
-      //unconfirmed, haven't seen any samples with rate 1 data
-      for(i = 0; i < 176; i++) confdatabits[i] = info[i + 16];
-      for(i = 0; i < 7; i++) confdatabits[i + 176] = info[i];
+      int k = 0;
+      for (i = 16; i < 96; i++)   confdatabits[k++] = info[i]; //first half
+      for (i = 100; i < 196; i++) confdatabits[k++] = info[i]; //second half
+      for (i = 0; i < 7; i++)     confdatabits[k++] = info[i]; //DBSN
+      CRCComputed = ComputeCrc9Bit(confdatabits, k);

-      CRCComputed = ComputeCrc9Bit(confdatabits, 183); 
      if (CRCExtracted == CRCComputed)
      {
        CRCCorrect = 1;
        state->data_block_crc_valid[slot][blockcounter] = 1;
-      } 
+      }
      else state->data_block_crc_valid[slot][blockcounter] = 0;

+      //debug confirmed data values (working now)
+      // fprintf (stderr, " K: %d; DSBN: %d; CRC: %03X / %03X;", k, dbsn, CRCComputed, CRCExtracted);
+
    }

    //copy info to dmr_pdu_bits
@@ -546,14 +553,14 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196

  }

-  
+
  //time for some pi
  if (databurst == 0x00) dmr_pi (opts, state, DMR_PDU, CRCCorrect, IrrecoverableErrors);

  //full link control
-  if (databurst == 0x01) dmr_flco (opts, state, DMR_PDU_bits, CRCCorrect, IrrecoverableErrors, 1); //VLC
-  if (databurst == 0x02) dmr_flco (opts, state, DMR_PDU_bits, CRCCorrect, IrrecoverableErrors, 2); //TLC
-  if (databurst == 0xEB) dmr_flco (opts, state, DMR_PDU_bits, CRCCorrect, IrrecoverableErrors, 3); //EMB
+  if (databurst == 0x01) dmr_flco (opts, state, DMR_PDU_bits, CRCCorrect, &IrrecoverableErrors, 1); //VLC
+  if (databurst == 0x02) dmr_flco (opts, state, DMR_PDU_bits, CRCCorrect, &IrrecoverableErrors, 2); //TLC
+  if (databurst == 0xEB) dmr_flco (opts, state, DMR_PDU_bits, CRCCorrect, &IrrecoverableErrors, 3); //EMB

  //dmr data header and multi block types (header, 1/2, 3/4, 1, UDT) - type 1
  if (databurst == 0x06) dmr_dheader (opts, state, DMR_PDU, DMR_PDU_bits, CRCCorrect, IrrecoverableErrors);
@@ -564,14 +571,14 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196

  //control signalling types (CSBK, MBC)
  if (databurst == 0x03) dmr_cspdu (opts, state, DMR_PDU_bits, DMR_PDU, CRCCorrect, IrrecoverableErrors);
-  
-  //both MBC header and MBC continuation will go to the block_assembler - type 2, and then to dmr_cspdu 
-  if (databurst == 0x04) 
+
+  //both MBC header and MBC continuation will go to the block_assembler - type 2, and then to dmr_cspdu
+  if (databurst == 0x04)
  {
    state->data_block_counter[slot] = 0; //zero block counter before running header
    state->data_header_valid[slot] = 1; //set valid header since we received one
    dmr_block_assembler (opts, state, DMR_PDU, pdu_len, databurst, 2);
-  } 
+  }
  if (databurst == 0x05) dmr_block_assembler (opts, state, DMR_PDU, pdu_len, databurst, 2);

  //Unified Single Data Block (USBD) -- Not to be confused with Unified Data Transport (UDT)
@@ -598,14 +605,14 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
  //   fprintf(stderr, " (FEC OK)");
  //   fprintf (stderr, "%s", KNRM);

-  // } 
+  // }

  if (IrrecoverableErrors != 0 && databurst != 0x08 && databurst != 0x09) //&& databurst != 0x05
  {
    fprintf (stderr, "%s", KRED);
    fprintf(stderr, " (FEC ERR)");
    fprintf (stderr, "%s", KNRM);
-  } 
+  }

  //print whether or not the 'RAS Field' bits are set to indicate RAS enabled (to be verified)
  if (is_ras == 1)
@@ -616,7 +623,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
    if (opts->payload == 1) fprintf (stderr, "%X ", BPTCReservedBits);
    fprintf (stderr, "%s", KNRM);
  }
-  
+
  if (IrrecoverableErrors == 0 && CRCCorrect == 0 && is_ras == 0 && databurst != 0x09 && databurst != 0x05)
  {
    fprintf (stderr, "%s", KRED);
@@ -640,7 +647,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
    // fprintf (stderr, " CRC - EXT %X CMP %X", CRCExtracted, CRCComputed);

    fprintf (stderr, "%s", KNRM);
-    
+
  }

 }
--- a/src/dmr_flco.c
+++ b/src/dmr_flco.c
@@ -12,7 +12,7 @@
 #include "dsd.h"

 //combined flco handler (vlc, tlc, emb), minus the superfluous structs and strings
-void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t CRCCorrect, uint32_t IrrecoverableErrors, uint8_t type)
+void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t CRCCorrect, uint32_t * IrrecoverableErrors, uint8_t type)
 {
  UNUSED(CRCCorrect);

@@ -26,7 +26,7 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
  uint8_t so = 0;
  uint32_t target = 0;
  uint32_t source = 0;
-  uint8_t capsite = 0; 
+  uint8_t capsite = 0;
  int restchannel = -1;
  int is_cap_plus = 0;
  int is_alias = 0;
@@ -56,13 +56,43 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
  target = (uint32_t)ConvertBitIntoBytes(&lc_bits[24], 24); //Target or Talk Group
  source = (uint32_t)ConvertBitIntoBytes(&lc_bits[48], 24);

-  //read ahead a little to get this for the xpt flag
-  if (IrrecoverableErrors == 0 && flco == 0x09 && fid == 0x68)
+  //Kenwood w/ Scrambler Application on DMR (disable this if clash with other link control, its obscure)
+  uint8_t is_kenwood_sc = 0;
+  if (*IrrecoverableErrors == 0 && CRCCorrect == 1 && pf == 1 && fid == 0x20 && (so & 0x40) == 0x40)
  {
-    sprintf (state->dmr_branding, "%s", "  Hytera"); 
+    pf = 0; //turn off PF flag
+    fid = 0; //unclear if this signals FID (or is cipher type for scrambler)
+
+    //NOTE: bit counter reset is handled after vc6 voice now
+
+    is_kenwood_sc = 1;
+
+    //if forcing a keystream, flip the encryption bit for this to unmute
+    if (state->ken_sc == 1)
+      so ^= 0x40;
+  }
+
+  //Kirisun
+  if (*IrrecoverableErrors == 0 && CRCCorrect == 1 && fid == 0x0A) //&& (so & 0x40) == 0x40
+  {
+      //disable late entry for DMRA, Flag 3 if encrypted, 0 if not
+      if (so & 0x40)
+        opts->dmr_le = 3;
+      else opts->dmr_le = 0;
+  }
+
+  //read ahead a little to get this for the xpt flag
+  if (*IrrecoverableErrors == 0 && flco == 0x09 && fid == 0x68)
+  {
+    sprintf (state->dmr_branding, "%s", "  Hytera");
    sprintf (state->dmr_branding_sub, "XPT ");
  }

+  //bug fix for Hytera Enhanced link control (go by the checksum in the message)
+  //a good checksum will set IrrecoverableErrors back to zero
+  if (fid == 0x68 && flco == 0x02 && *IrrecoverableErrors == 0)
+    *IrrecoverableErrors = 1;
+
  //look at the dmr_branding_sub for the XPT string
  //branding sub is set at CSBK(68-3A and 3B), SLCO 8, and here on 0x09
  if (strcmp (state->dmr_branding_sub, "XPT ") == 0) is_xpt = 1;
@@ -78,12 +108,12 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
    if (type == 3) fprintf (stderr, "%s", KRED);
    fprintf (stderr, " SLOT %d", state->currentslot+1);
    fprintf (stderr, " Protected LC ");
-    goto END_FLCO; 
-  } 
+    goto END_FLCO;
+  }

-  if (IrrecoverableErrors == 0)
+  if (*IrrecoverableErrors == 0)
  {
-    
+
    if (slot == 0) state->dmr_flco = flco;
    else state->dmr_flcoR = flco;

@@ -96,16 +126,17 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
    }

    //Embedded Talker Alias Header Only (format and len storage)
-    if ( (fid == 0 || fid == 0x68) && type == 3 && flco == 0x04) 
+    if ( (fid == 0 || fid == 0x68) && type == 3 && flco == 0x04)
    {
-      dmr_embedded_alias_header(opts, state, lc_bits);
+      is_alias = 1;
+      dmr_talker_alias_lc_header(opts, state, slot, lc_bits);
    }

    //Embedded Talker Alias Header (continuation) and Blocks
-    if ( (fid == 0 || fid == 0x68) && type == 3 && flco > 0x03 && flco < 0x08) 
+    if ( (fid == 0 || fid == 0x68) && type == 3 && flco > 0x04 && flco < 0x08)
    {
      is_alias = 1;
-      dmr_embedded_alias_blocks(opts, state, lc_bits);
+      dmr_talker_alias_lc_blocks(opts, state, slot, flco-5, lc_bits);
    }

    //Embedded GPS
@@ -122,15 +153,19 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
      capsite = (uint8_t)ConvertBitIntoBytes(&lc_bits[48], 4); //don't believe so
      restchannel = (int)ConvertBitIntoBytes(&lc_bits[52], 4); //
      source = (uint32_t)ConvertBitIntoBytes(&lc_bits[56], 16);
+      if (flco == 0x07)
+        state->gi[slot] = 1;
+      else state->gi[slot] = 0;
    }

    //Unknown CapMax/Moto Things
-    if (fid == 0x10 && (flco == 0x08 || flco == 0x28)) 
+    if (fid == 0x10 && (flco == 0x08 || flco == 0x28 || flco == 0x29))
    {
      //NOTE: fid 0x10 and flco 0x08 (emb) produces a lot of 'zero' bytes
      //this has been observed to happen often on CapMax systems, so I believe it could be some CapMax 'thing'
      //Unknown Link Control - FLCO=0x08 FID=0x10 SVC=0xC1 or FLCO=0x08 FID=0x10 SVC=0xC0 <- probably no SVC bits in the lc
      //flco 0x28 has also been observed lately but the tg and src values don't match
+      //flco 0x29 just observed, similar pattern to 0x08 listed above
      //another flco 0x10 does seem to match, so is probably capmax group call flco
      if (type == 1) fprintf (stderr, "%s \n", KCYN);
      if (type == 2) fprintf (stderr, "%s \n", KCYN);
@@ -151,11 +186,19 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C

      //reset data header format storage
      state->data_header_format[slot] = 7;
-      //flag off data header validity 
-      state->data_header_valid[slot] = 0; 
+      //reset data header sap storage
+      state->data_header_sap[slot] = 0;
+      //flag off data header validity
+      state->data_header_valid[slot] = 0;
      //flag off conf data flag
      state->data_conf_data[slot] = 0;
-      
+      //reset padding
+      state->data_block_poc[slot] = 0;
+      //reset byte counter
+      state->data_byte_ctr[slot] = 0;
+      //reset ks start value
+      state->data_ks_start[slot] = 0;
+
      goto END_FLCO;
    }

@@ -173,7 +216,7 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
      goto END_FLCO;
    }

-    //look for any Hytera XPT system, adjust TG to 16-bit allocation 
+    //look for any Hytera XPT system, adjust TG to 16-bit allocation
    //Groups use only 8 out of 16, but 16 always seems to be allocated
    //private calls use 16-bit target values hashed to 8-bit in the site status csbk
    //the TLC preceeds the VLC for a 'handshake' call setup in XPT
@@ -186,17 +229,17 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C

      //the crc8 hash is the value represented in the CSBK when dealing with private calls
      for (int i = 0; i < 16; i++) target_hash[i] = lc_bits[32+i];
-      tg_hash = crc8 (target_hash, 16); 
-    } 
+      tg_hash = crc8 (target_hash, 16);
+    }

-    //XPT Call 'Grant/Alert' Setup Occurs in TLC with a flco 0x09 
+    //XPT Call 'Grant/Alert' Setup Occurs in TLC with a flco 0x09
    if (fid == 0x68 && flco == 0x09)
    {
      //The CSBK always uses an 8-bit TG/TGT; The White Papers (user manuals) say 8-bit TG and 16-bit SRC addressing
      //private calls and indiv data calls use a hash of their 8 bit tgt values in the CSBK
      xpt_int = (uint8_t)ConvertBitIntoBytes(&lc_bits[16], 4); //This is consistent with an LCN value, not an LSN value
      xpt_free = (uint8_t)ConvertBitIntoBytes(&lc_bits[24], 4); //24 and 4 on 0x09
-      xpt_hand = (uint8_t)ConvertBitIntoBytes(&lc_bits[28], 4); //handshake kind: 0 - ordinary; 1-2 Interrupts; 3-15 reserved; 
+      xpt_hand = (uint8_t)ConvertBitIntoBytes(&lc_bits[28], 4); //handshake kind: 0 - ordinary; 1-2 Interrupts; 3-15 reserved;

      target = (uint32_t)ConvertBitIntoBytes(&lc_bits[32], 16); //16-bit allocation
      source = (uint32_t)ConvertBitIntoBytes(&lc_bits[56], 16); //16-bit allocation
@@ -207,13 +250,13 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C

      //the crc8 hash is the value represented in the CSBK when dealing with private calls
      for (int i = 0; i < 16; i++) target_hash[i] = lc_bits[32+i];
-      tg_hash = crc8 (target_hash, 16); 
+      tg_hash = crc8 (target_hash, 16);

      fprintf (stderr, "%s \n", KGRN);
      fprintf (stderr, " SLOT %d ", state->currentslot+1);
-      if (opts->payload == 1) fprintf(stderr, "FLCO=0x%02X FID=0x%02X ", flco, fid); 
+      if (opts->payload == 1) fprintf(stderr, "FLCO=0x%02X FID=0x%02X ", flco, fid);
      fprintf (stderr, "TGT=%u SRC=%u ", target, source);
-      
+
      fprintf (stderr, "Hytera XPT ");

      //Group ID ranges from 1 to 240; emergency group call ID ranges from 250 to 254; all call ID is 255.
@@ -222,7 +265,7 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
        fprintf (stderr, "Group "); //according to observation
        if (target > 248 && target < 255) fprintf (stderr, "Emergency ");
        if (target == 255) fprintf (stderr, "All ");
-      } 
+      }
      else fprintf (stderr, "Private "); //according to observation
      fprintf (stderr, "Call Alert "); //Alert or Grant

@@ -233,7 +276,7 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
      if (reserved == 0 && opts->payload == 1) fprintf(stderr, "TGT Hash=%d; ", tg_hash);
      if (opts->payload == 1) fprintf(stderr, "HSK=%X; ", xpt_hand);
      //extra verbosity on handshake types found in the patent
-      if (opts->payload == 1) 
+      if (opts->payload == 1)
      {
        fprintf (stderr, "Handshake - ");
        if (xpt_hand == 0) fprintf (stderr, "Ordinary; ");
@@ -276,8 +319,8 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
    }

    //unknown other manufacturer or OTA ENC, etc.
-    //removed tait from the list, added hytera 0x08
-    if (fid != 0 && fid != 0x68 && fid != 0x10 && fid != 0x08) 
+    //removed tait from the list, added hytera 0x08, added Kirisun and KW Scrambler LC
+    if (fid != 0 && fid != 0x68 && fid != 0x10 && fid != 0x08 && fid != 0x0A && is_kenwood_sc == 0)
    {
      if (type == 1) fprintf (stderr, "%s \n", KYEL);
      if (type == 2) fprintf (stderr, "%s \n", KYEL);
@@ -288,10 +331,76 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
      goto END_FLCO;
    }

-  }  
+  }
+  else //Look for Hytera PI LC (this may fail the FEC, but have a secondary checksum value)
+  {
+    if (fid == 0x68 && flco == 0x02)
+    {
+      uint8_t checksum = 0;
+      uint8_t alg = (uint8_t)ConvertBitIntoBytes(&lc_bits[0], 8);
+      uint8_t key = (uint8_t)ConvertBitIntoBytes(&lc_bits[16], 8);
+      unsigned long long int mi = (unsigned long long int)ConvertBitIntoBytes(&lc_bits[24], 40);
+      fprintf (stderr, "%s", KYEL);
+      fprintf (stderr, " Slot %d Alg: %02X; KEY ID: %02X; MI(40): %010llX;", slot+1, alg, key, mi);
+      fprintf (stderr, " Hytera Enhanced; ");
+
+      if (slot == 0 && state->R != 0)
+        fprintf (stderr, "Key: %010llX; ", state->R);
+
+      if (slot == 1 && state->RR != 0)
+        fprintf (stderr, "Key: %010llX; ", state->RR);
+
+      for (int i = 0; i < 8; i++)
+      {
+        checksum += (uint8_t)ConvertBitIntoBytes(&lc_bits[i*8], 8);
+        checksum &= 0xFF;
+      }
+      checksum = ~checksum & 0xFF;
+      checksum++;
+
+      //debug
+      // fprintf (stderr, " CHKSUM: %02X / %02X", checksum, (uint8_t)ConvertBitIntoBytes(&lc_bits[64], 8));
+
+      if (checksum == (uint8_t)ConvertBitIntoBytes(&lc_bits[64], 8))
+      {
+        if (slot == 0)
+        {
+          state->dmr_so |= 0x40; //OR the enc bit onto the SO
+          state->payload_algid = alg;
+          state->payload_keyid = key;
+          state->payload_mi = mi;
+        }
+        else
+        {
+          state->dmr_soR |= 0x40; //OR the enc bit onto the SO
+          state->payload_algidR = alg;
+          state->payload_keyidR = key;
+          state->payload_miR = mi;
+        }
+
+        //disable late entry for DMRA (hopefully, there aren't any systems running both DMRA and Hytera Enhanced mixed together)
+        opts->dmr_le = 2;
+
+        *IrrecoverableErrors = 0; //only set if checksum passes
+      }
+
+      if (checksum == (uint8_t)ConvertBitIntoBytes(&lc_bits[64], 8))
+        // fprintf (stderr, " (Checksum Okay);");
+        {;}
+      else
+      {
+        fprintf (stderr, "%s", KRED);
+        fprintf (stderr, " (Checksum Err);");
+        fprintf (stderr, "\n");
+      }
+
+      fprintf (stderr, "%s ", KNRM);
+      goto END_FLCO;
+    }
+  }

  //will want to continue to observe for different flco and fid combinations to find out their meaning
-  if(IrrecoverableErrors == 0 && is_alias == 0 && is_gps == 0) 
+  if(*IrrecoverableErrors == 0 && is_alias == 0 && is_gps == 0)
  {
    //set overarching manufacturer in use when non-standard feature id set is up
    if (fid != 0) state->dmr_mfid = fid;
@@ -318,8 +427,8 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
      {
        state->last_vc_sync_time = time(NULL);
        state->last_cc_sync_time = time(NULL);
-      } 
-      
+      }
+
    }

    if (type == 2) //TLC, zero out target, source, so, and fid per channel, and other odd and ends
@@ -329,31 +438,45 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
      {
        state->dmr_fid = 0;
        state->dmr_so = 0;
-        // state->lasttg = 0;
-        // state->lastsrc = 0;
+        state->lasttg = 0;
+        state->lastsrc = 0;
        state->payload_algid = 0;
        state->payload_mi = 0;
        state->payload_keyid = 0;
        //reset gain
        if (opts->floating_point == 1)
          state->aout_gain = opts->audio_gain;
+
+        state->dmr_alias_block_len[0] = 0;
+        state->dmr_alias_char_size[0] = 0;
+        state->dmr_alias_format[0] = 0;
+        sprintf (state->generic_talker_alias[0], "%s", "");
+        // sprintf (state->event_history_s[0].Event_History_Items[0].alias, "%s", "BUMBLEBEETUNA");
+        memset (state->dmr_pdu_sf[0], 0, sizeof(state->dmr_pdu_sf[0]));
      }
      if (state->currentslot == 1)
      {
        state->dmr_fidR = 0;
        state->dmr_soR = 0;
-        // state->lasttgR = 0;
-        // state->lastsrcR = 0;
+        state->lasttgR = 0;
+        state->lastsrcR = 0;
        state->payload_algidR = 0;
        state->payload_miR = 0;
        state->payload_keyidR = 0;
        //reset gain
        if (opts->floating_point == 1)
-          state->aout_gainR = opts->audio_gain; 
+          state->aout_gainR = opts->audio_gain;
+
+        state->dmr_alias_block_len[1] = 0;
+        state->dmr_alias_char_size[1] = 0;
+        state->dmr_alias_format[1] = 0;
+        sprintf (state->generic_talker_alias[1], "%s", "");
+        // sprintf (state->event_history_s[1].Event_History_Items[0].alias, "%s", "BUMBLEBEETUNA");
+        memset (state->dmr_pdu_sf[1], 0, sizeof(state->dmr_pdu_sf[1]));
      }
-      
+
    }
-    
+
    //only assign this value here if not trunking
    // if (opts->p25_trunk == 0) //may be safe to always do this now with code changes, will want to test at some point (tg hold w/ dual voice / slco may optimally need this set)
    {
@@ -364,14 +487,14 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
        // if (state->trunk_chan_map[restchannel] != 0)
        // {
        //   state->p25_cc_freq = state->trunk_chan_map[restchannel];
-        // } 
+        // }
      }
    }

    if (type == 1) fprintf (stderr, "%s \n", KGRN);
    if (type == 2) fprintf (stderr, "%s \n", KRED);
    if (type == 3) fprintf (stderr, "%s", KGRN);
-    
+
    fprintf (stderr, " SLOT %d ", state->currentslot+1);
    fprintf(stderr, "TGT=%u SRC=%u ", target, source);
    if (opts->payload == 1 && is_xpt == 1 && flco == 0x3) fprintf(stderr, "HASH=%d ", tg_hash);
@@ -383,7 +506,7 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
    //0x20 on the Embedded Voice Burst Sync seems to indicate a Moto (non-specific) Group Call in progress
    //its possible that both EMB FID 0x10 FLCO 0x20 and 0x23 are just Moto but non-specific (observed 0x20 on Tier 2)

-    if (fid == 0x68) sprintf (state->call_string[slot], " Hytera  "); 
+    if (fid == 0x68) sprintf (state->call_string[slot], " Hytera  ");

    else if (flco == 0x4 || flco == 0x5 || flco == 0x7 || flco == 0x23) //Cap+ Things
    {
@@ -395,24 +518,28 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
        // strcat (state->call_string[slot], " Grp");
        sprintf (state->call_string[slot], "   Group ");
        fprintf (stderr, "Group ");
+        state->gi[slot] = 0;
      }
      else
      {
        // strcat (state->call_string[slot], " Pri");
        sprintf (state->call_string[slot], " Private ");
        fprintf (stderr, "Private ");
-      } 
+        state->gi[slot] = 1;
+      }
    }
    else if (flco == 0x3) //UU_V_Ch_Usr
    {
      sprintf (state->call_string[slot], " Private ");
-      fprintf (stderr, "Private "); 
+      fprintf (stderr, "Private ");
+      state->gi[slot] = 1;
    }
    else //Grp_V_Ch_Usr -- still valid on hytera VLC
    {
      sprintf (state->call_string[slot], "   Group ");
-      fprintf (stderr, "Group "); 
-    } 
+      fprintf (stderr, "Group ");
+      state->gi[slot] = 0;
+    }

    if(so & 0x80)
    {
@@ -460,21 +587,28 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
          state->group_tally++;
        }

+        //run a watchdog here so we can update this with the crypto variables and ENC LO
+        if (target != 0 && lo == 0)
+        {
+          sprintf (state->event_history_s[slot].Event_History_Items[0].internal_str, "Target: %d; has been locked out; Encryption Lock Out Enabled.", target);
+          watchdog_event_current(opts, state, slot);
+        }
+
        //Craft a fake CSBK pdu send it to run as a p_clear to return to CC if available
        uint8_t dummy[12]; uint8_t* dbits; memset (dummy, 0, sizeof(dummy)); dummy[0] = 46; dummy[1] = 255;
        if ( (strcmp(gm, "B") == 0) && (strcmp(gn, "ENC LO") == 0)  ) //&& (opts->trunk_tune_data_calls == 0)
          dmr_cspdu (opts, state, dbits, dummy, 1, 0);

      }
-      
+
    }
    //REMUS! Uncomment Line Below if desired
    // else strcat (state->call_string[slot], "          ");

-    
+
    if (1 == 1) //fid == 0x10
    {
-      /* Check the "Service Option" bits */ 
+      /* Check the "Service Option" bits */
      if( (fid == 0x10) && (so & 0x20) ) //Motorola FID 0x10 Only
      {
        //REMUS! Uncomment Line Below if desired
@@ -492,13 +626,13 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
        //REMUS! Uncomment Line Below if desired
        // strcat (state->call_string[slot], "-BC   ");
        fprintf(stderr, "Broadcast ");
-      } 
+      }
      if(so & 0x04)
      {
        //REMUS! Uncomment Line Below if desired
        // strcat (state->call_string[slot], "-OVCM ");
        fprintf(stderr, "OVCM ");
-      } 
+      }
      if(so & 0x03)
      {
        if((so & 0x03) == 0x01)
@@ -506,36 +640,48 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
          //REMUS! Uncomment Line Below if desired
          // strcat (state->call_string[slot], "-P1");
          fprintf(stderr, "Priority 1 ");
-        } 
+        }
        else if((so & 0x03) == 0x02)
        {
          //REMUS! Uncomment Line Below if desired
          // strcat (state->call_string[slot], "-P2");
          fprintf(stderr, "Priority 2 ");
-        } 
+        }
        else if((so & 0x03) == 0x03)
        {
          //REMUS! Uncomment Line Below if desired
          // strcat (state->call_string[slot], "-P3");
          fprintf(stderr, "Priority 3 ");
-        } 
+        }
        else /* We should never go here */
        {
          //REMUS! Uncomment Line Below if desired
          // strcat (state->call_string[slot], "  ");
-          fprintf(stderr, "No Priority "); 
-        } 
+          fprintf(stderr, "No Priority ");
+        }
      }
    }
-    
+
    //should rework this back into the upper portion
+    if (fid == 0x0A) fprintf (stderr, "Kirisun ");
    if (fid == 0x68) fprintf (stderr, "Hytera ");
    if (is_xpt) fprintf (stderr, "XPT ");
-    if (fid == 0x68 && flco == 0x00) fprintf (stderr, "Group ");
-    if (fid == 0x68 && flco == 0x03) fprintf (stderr, "Private ");
+    if (fid == 0x68 && flco == 0x00)
+    {
+      fprintf (stderr, "Group ");
+      state->gi[slot] = 0;
+    }
+    if (fid == 0x68 && flco == 0x03)
+    {
+      fprintf (stderr, "Private ");
+      state->gi[slot] = 1;
+    }
+
+    if (is_kenwood_sc)
+      fprintf(stderr, "Kenwood Scrambler ");

    fprintf(stderr, "Call ");
-    
+

    //check Cap+ rest channel info if available and good fec
    if (is_cap_plus == 1)
@@ -546,7 +692,7 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
        fprintf (stderr, "Rest LSN: %d", restchannel);
      }
    }
-  
+
    fprintf (stderr, "%s ", KNRM);

    //group labels
@@ -577,7 +723,7 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
      fprintf (stderr, "%s", KYEL);
      fprintf (stderr, "Key %lld ", state->K);
      fprintf (stderr, "%s ", KNRM);
-    } 
+    }

    if (state->K1 != 0 && fid == 0x68 && so & 0x40 && slot == 0 && state->payload_algid == 0)
    {
@@ -612,11 +758,45 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
      fprintf (stderr, "Key %010llX ", state->RR);
      fprintf (stderr, "%s ", KNRM);
    }
-    
+
+    if (slot == 0 && state->payload_algid == 0x02 && state->R != 0)
+    {
+      fprintf (stderr, "%s", KYEL);
+      fprintf (stderr, "Key: %010llX ", state->R);
+      fprintf (stderr, "%s ", KNRM);
+    }
+
+    if (slot == 1 && state->payload_algidR == 0x02 && state->RR != 0)
+    {
+      fprintf (stderr, "%s", KYEL);
+      fprintf (stderr, "Key: %010llX ", state->RR);
+      fprintf (stderr, "%s ", KNRM);
+    }
+
+    if (slot == 0 && (state->payload_algid == 0x25 || state->payload_algid == 0x24) && state->aes_key_loaded[0] == 1)
+    {
+      fprintf (stderr, "\n ");
+      fprintf (stderr, "%s", KYEL);
+      fprintf (stderr, "Key: %016llX %016llX ", state->A1[0], state->A2[0]);
+      if (state->payload_algid == 0x25)
+        fprintf (stderr, "%016llX %016llX", state->A3[0], state->A4[0]);
+      fprintf (stderr, "%s ", KNRM);
+    }
+
+    if (slot == 1 && (state->payload_algidR == 0x25 || state->payload_algidR == 0x24) && state->aes_key_loaded[1] == 1)
+    {
+      fprintf (stderr, "\n ");
+      fprintf (stderr, "%s", KYEL);
+      fprintf (stderr, "Key: %016llX %016llX ", state->A1[1], state->A2[1]);
+      if (state->payload_algidR == 0x25)
+        fprintf (stderr, "%016llX %016llX", state->A3[1], state->A4[1]);
+      fprintf (stderr, "%s ", KNRM);
+    }
+
  }

  END_FLCO:
-  
+
  //blank the call string here if its a TLC
  if (type == 2) sprintf (state->call_string[slot], "%s", "                     "); //21 spaces

@@ -626,7 +806,7 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
    fprintf (stderr, "%s", KNRM);
  }

-  if(IrrecoverableErrors != 0)
+  if(*IrrecoverableErrors != 0)
  {
    if (type != 3) fprintf (stderr, "\n");
    fprintf (stderr, "%s", KRED);
@@ -639,14 +819,14 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
 }

 //externalized dmr cach - tact and slco fragment handling
-uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25]) 
+uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25])
 {
  int i, j;
  uint8_t err = 0;
-  uint8_t tact_valid = 0; 
+  uint8_t tact_valid = 0;
  UNUSED(tact_valid);

-  bool h1, h2, h3, crc; 
+  bool h1, h2, h3, crc;

  //dump payload - testing
  uint8_t slco_raw_bits[68]; //raw
@@ -654,7 +834,7 @@ uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25])

  //tact pdu
  uint8_t tact_bits[7];
-  uint8_t at = 0; //access type, set to 1 during continuous transmission mode 
+  uint8_t at = 0; //access type, set to 1 during continuous transmission mode
  uint8_t slot = 2; //tdma time slot
  uint8_t lcss = 0; //link control start stop (9.3.3) NOTE: There is no Single fragment LC defined for CACH signalling
  UNUSED2(at, slot);
@@ -693,13 +873,13 @@ uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25])
    {
      slco_raw_bits[i] = cach_bits[i+7];
    }
-    
+
    //De-interleave
    int src = 0;
    for (i = 0; i < 17; i++)
    {
 		  src = (i * 4) % 67;
-		  slco_bits[i] = slco_raw_bits[src]; 
+		  slco_bits[i] = slco_raw_bits[src];
 	  }
 	  //slco_bits[i] = slco_raw_bits[i];

@@ -719,14 +899,14 @@ uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25])
  if (lcss == 1) //first block, reset counters and memset
  {
    //reset the full cach and counter
-    state->dmr_cach_counter = 0; 
+    state->dmr_cach_counter = 0;
    memset (state->dmr_cach_fragment, 1, sizeof (state->dmr_cach_fragment));
-  } 
+  }
  if (lcss == 3) state->dmr_cach_counter++; //continuation, so increment counter by one.
  if (lcss == 2) //final segment - assemble, de-interleave, hamming, crc, and execute
  {
-    state->dmr_cach_counter = 3; 
-  } 
+    state->dmr_cach_counter = 3;
+  }

  //sanity check
  if (state->dmr_cach_counter > 3) //marginal/shaky/bad signal or tuned away
@@ -735,7 +915,7 @@ uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25])
    lcss = 5; //toss away value
    state->dmr_cach_counter = 0;
    memset (state->dmr_cach_fragment, 1, sizeof (state->dmr_cach_fragment));
-    err = 1; 
+    err = 1;
    return (err);
  }

@@ -763,7 +943,7 @@ uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25])
    for (i = 0; i < 67; i++)
    {
 		  src = (i * 4) % 67;
-		  slco_bits[i] = slco_raw_bits[src]; 
+		  slco_bits[i] = slco_raw_bits[src];
 	  }
 	  slco_bits[i] = slco_raw_bits[i];

@@ -804,8 +984,8 @@ uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25])
        fprintf (stderr, "\n");
      else if (opts->payload == 1 && state->dmrburstR == 16 && state->currentslot == 1) //if current slot is voice with payload enabled
        fprintf (stderr, "\n");
-    } 
-    
+    }
+
  }
  return (err); //return err value based on success or failure, even if we aren't checking it
 }
@@ -818,14 +998,14 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
  uint8_t slco_bytes[6]; //completed byte blocks for payload print
  for (i = 0; i < 5; i++) slco_bytes[i] = (uint8_t)ConvertBitIntoBytes(&slco_bits[i*8], 8);
  slco_bytes[5] = (uint8_t)ConvertBitIntoBytes(&slco_bits[32], 4);
-  
+

  //just going to decode the Short LC with all potential parameters known
  uint8_t slco = (uint8_t)ConvertBitIntoBytes(&slco_bits[0], 4);
  uint8_t model = (uint8_t)ConvertBitIntoBytes(&slco_bits[4], 2);
  uint16_t netsite = (uint16_t)ConvertBitIntoBytes(&slco_bits[6], 12);
  uint8_t reg = slco_bits[18]; //registration required/not required or normalchanneltype/composite cch
-  uint8_t csc = (uint16_t)ConvertBitIntoBytes(&slco_bits[19], 9); //common slot counter, 0-511
+  uint16_t csc = (uint16_t)ConvertBitIntoBytes(&slco_bits[19], 9); //common slot counter, 0-511
  UNUSED(netsite);

  uint16_t net = 0;
@@ -872,7 +1052,7 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
  //assigning n as largest possible value for model type

  //Sys_Parms
-  if (slco == 0x2 || slco == 0x3) 
+  if (slco == 0x2 || slco == 0x3)
  {
    if (model == 0) //Tiny
    {
@@ -925,7 +1105,7 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])

  //Cap+
  uint8_t capsite = (uint8_t)ConvertBitIntoBytes(&slco_bits[22], 3); //Seems more consistent
-  uint8_t restchannel = (uint8_t)ConvertBitIntoBytes(&slco_bits[16], 4); 
+  uint8_t restchannel = (uint8_t)ConvertBitIntoBytes(&slco_bits[16], 4);
  uint8_t cap_reserved = (uint8_t)ConvertBitIntoBytes(&slco_bits[20], 2); //significant value?

  //Hytera XPT
@@ -962,7 +1142,7 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
  else if (slco == 0x3) //P_SYS_Parms
  {
    uint16_t syscode = (uint16_t)ConvertBitIntoBytes(&slco_bits[4], 14);
-    if (n != 0) fprintf (stderr, " SLC_P_SYS_PARMS: %s; Net ID: %d; Site ID: %d.%d; Comp CC: %d;", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, reg); 
+    if (n != 0) fprintf (stderr, " SLC_P_SYS_PARMS: %s; Net ID: %d; Site ID: %d.%d; Comp CC: %d;", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, reg);
    else fprintf (stderr, " SLC_P_SYS_PARMS: %s; Net ID: %d; Site ID: %d;", model_str, net, site);
    fprintf (stderr, " SYS: %04X;", syscode); //#192

@@ -979,13 +1159,13 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
    fprintf (stderr, " Activity Update"); //102 361-2 7.1.3.2
    fprintf (stderr, " TS1: %s; Hash: %d;", ts1_str, ts1_hash);
    fprintf (stderr, " TS2: %s; Hash: %d;", ts2_str, ts2_hash);
-  } 
+  }
  else if (slco == 0x9)
  {
    fprintf (stderr, " SLCO Connect Plus Traffic Channel - Net ID: %d Site ID: %d", con_netid, con_siteid);
    sprintf (state->dmr_site_parms, "%d-%d ", con_netid, con_siteid);
  }
-    
+
  else if (slco == 0xA)
  {
    fprintf (stderr, " SLCO Connect Plus Control Channel - Net ID: %d Site ID: %d", con_netid, con_siteid);
@@ -1004,9 +1184,13 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
      ccfreq = (long int)opts->rtlsdr_center_freq;
      if (ccfreq != 0) state->p25_cc_freq = ccfreq;
    }
-    
+
+    //if on Con+ control channel and no activity in this window
+    if ( (time(NULL) - state->last_vc_sync_time) > 2 ) //may use last_cc_sync_time instead
+      rotate_symbol_out_file(opts, state);
+
  }
-   
+
  else if (slco == 0xF)
  {
    fprintf (stderr, " SLCO Capacity Plus Site: %d - Rest LSN: %d - RS: %02X", capsite, restchannel, cap_reserved);
@@ -1019,7 +1203,7 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])

      //if both slots have some cobination of vlc, pi, voice, or tlc
      int busy = 0;
-      if ( (state->dmrburstL == 16 || state->dmrburstL == 0 || state->dmrburstL == 1 || state->dmrburstL == 2) && 
+      if ( (state->dmrburstL == 16 || state->dmrburstL == 0 || state->dmrburstL == 1 || state->dmrburstL == 2) &&
           (state->dmrburstR == 16 || state->dmrburstR == 0 || state->dmrburstR == 1 || state->dmrburstR == 2)) busy = 1;
      if (busy)
      {
@@ -1045,7 +1229,7 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
            //RIGCTL
            if (opts->use_rigctl == 1)
            {
-              if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw); 
+              if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
              SetFreq(opts->rigctl_sockfd, state->p25_cc_freq);
              state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
              opts->p25_is_tuned = 0;
@@ -1075,7 +1259,7 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
    //The Priority Repeater and Priority Hash values stem from SDRTrunk, but I've never seen these values not be zeroes
    fprintf (stderr, " SLCO Hytera XPT - Free LCN %d - PRI LCN %d - PRI HASH: %02X", xpt_free, xpt_pri, xpt_hash);
    //NOTE: on really busy systems, this free repeater assignment can lag due to the 4 TS requirment to get SLC
-    // fprintf (stderr, " SLCO Hytera XPT - Free LCN %d ", xpt_free); 
+    // fprintf (stderr, " SLCO Hytera XPT - Free LCN %d ", xpt_free);
    sprintf (state->dmr_branding_sub, "XPT ");

    //add string for ncurses terminal display
@@ -1111,7 +1295,7 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
            //RIGCTL
            if (opts->use_rigctl == 1)
            {
-              if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw); 
+              if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
              SetFreq(opts->rigctl_sockfd, state->p25_cc_freq);
              state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
              opts->p25_is_tuned = 0;
@@ -1135,7 +1319,7 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
      }
    }
  }
-    
+
  else fprintf (stderr, " SLCO Unknown - %d ", slco);

  if (opts->payload == 1 && slco != 0) //if not SLCO NULL
@@ -1145,101 +1329,9 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
    {
      fprintf (stderr, "[%02X]", slco_bytes[i]);
    }
-    fprintf (stderr, "\n"); //if its a voice frame, we need the line break 
+    fprintf (stderr, "\n"); //if its a voice frame, we need the line break
  }

  fprintf (stderr, "%s", KNRM);
-  
-}
-
-//externalize embedded alias to keep the flco function relatively clean
-void dmr_embedded_alias_header (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
-{
-  UNUSED(opts);
-  
-  uint8_t slot = state->currentslot;
-  uint8_t format = (uint8_t)ConvertBitIntoBytes(&lc_bits[16], 2); 
-  uint8_t len;
-
-  //this len seems to pertain to number of blocks? not bit len.
-  //len = (uint8_t)ConvertBitIntoBytes(&lc_bits[18], 5); 
-
-  if (format == 0) len = 7;
-  else if (format == 1 || format == 2) len = 8;
-  else len = 16;
-
-  state->dmr_alias_format[slot] = format;
-  state->dmr_alias_len[slot] = len;
-
-  //fprintf (stderr, "F: %d L: %d - ", format, len);
-  
-}
-
-void dmr_embedded_alias_blocks (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
-{
-  UNUSED(opts);
-
-  fprintf (stderr, "%s", KYEL);
-  fprintf (stderr, " Embedded Alias: ");
-  uint8_t slot = state->currentslot;
-  uint8_t block = (uint8_t)ConvertBitIntoBytes(&lc_bits[2], 6); //FLCO equals block number
-  uint8_t format = state->dmr_alias_format[slot]; //0=7-bit; 1=ISO8; 2=UTF-8; 3=UTF16BE
-  uint8_t len =  state->dmr_alias_len[slot];
-  uint8_t start; //starting position depends on context of block and format
-  UNUSED(format);
-
-  //Cap Max Variation
-  uint8_t fid = (uint8_t)ConvertBitIntoBytes(&lc_bits[8], 8);
-  if (fid == 0x10) block = block - 0x10; //CapMax adds 0x10 to its FLCO (block num) in its Embedded Aliasing
-
-  //there is some issue with the next three lines of code that prevent proper assignments, not sure what.
-  //if (block > 4) start = 16;
-  //else if (block == 4 && format > 0) start = 23; //8-bit and 16-bit chars
-  //else start = 24;
-
-  //forcing start to 16 make it work on 8-bit alias, len seems okay when set off of format
-  start = 16; 
-  len = 8;
-
-  // fprintf (stderr, "block: %d start: %d len: %d ", block, start, len);
-
-  //all may not be used depending on format, len, start.
-  uint16_t A0, A1, A2, A3, A4, A5, A6; 
-
-  //sanity check
-  if (block > 7) block = 4; //prevent oob array (although we should never get here)
-
-  if (len > 6) //if not greater than zero, then the header hasn't arrived yet
-  {
-    A0 = 0; A1 = 0; A2 = 0; A3 = 0; A4 = 0; A5 = 0; A6 = 0; //NULL ASCII Characters
-    A0 = (uint16_t)ConvertBitIntoBytes(&lc_bits[start+len*0], len);
-    A1 = (uint16_t)ConvertBitIntoBytes(&lc_bits[start+len*1], len);
-    A2 = (uint16_t)ConvertBitIntoBytes(&lc_bits[start+len*2], len);
-    A3 = (uint16_t)ConvertBitIntoBytes(&lc_bits[start+len*3], len);
-    A4 = (uint16_t)ConvertBitIntoBytes(&lc_bits[start+len*4], len);
-    A5 = (uint16_t)ConvertBitIntoBytes(&lc_bits[start+len*5], len);
-    A6 = (uint16_t)ConvertBitIntoBytes(&lc_bits[start+len*6], len);
-
-    //just going to assign the usual ascii set here to prevent 'naughty' characters, sans diacriticals
-    if (A0 > 0x19 && A0 < 0x7F) sprintf (state->dmr_alias_block_segment[slot][block-4][0], "%c", A0);
-    if (A1 > 0x19 && A1 < 0x7F) sprintf (state->dmr_alias_block_segment[slot][block-4][1], "%c", A1);
-    if (A2 > 0x19 && A2 < 0x7F) sprintf (state->dmr_alias_block_segment[slot][block-4][2], "%c", A2);
-    if (A3 > 0x19 && A3 < 0x7F) sprintf (state->dmr_alias_block_segment[slot][block-4][3], "%c", A3);
-    if (A4 > 0x19 && A4 < 0x7F) sprintf (state->dmr_alias_block_segment[slot][block-4][4], "%c", A4);
-    if (A5 > 0x19 && A5 < 0x7F) sprintf (state->dmr_alias_block_segment[slot][block-4][5], "%c", A5);
-    if (A6 > 0x19 && A6 < 0x7F) sprintf (state->dmr_alias_block_segment[slot][block-4][6], "%c", A6);
-
-    for (int i = 0; i < 4; i++)
-    {
-      for (int j = 0; j < 7; j++)
-      {
-        fprintf (stderr, "%s", state->dmr_alias_block_segment[slot][i][j]); 
-      }
-    }
-    
-
-  }
-  else fprintf (stderr, "Missing Header Block Format and Len Data");
-  fprintf (stderr, "%s", KNRM);
-  
+
 }
--- a/src/dmr_le.c
+++ b/src/dmr_le.c
@@ -11,26 +11,9 @@
 //gather ambe_fr mi fragments for processing
 void dmr_late_entry_mi_fragment (dsd_opts * opts, dsd_state * state, uint8_t vc, uint8_t ambe_fr[4][24], uint8_t ambe_fr2[4][24], uint8_t ambe_fr3[4][24])
 {
-  
+
  uint8_t slot = state->currentslot;

-  //enforce RC4 due to missing PI header, but with valid SVC Opts
-  //ideally, this would be handled by VC-F single burst, but its not fully reliable compared to this
-  //due to multiple signalling occurring inside of it, depending on system type
-  if (state->M == 0x21)
-  {
-    if (slot == 0 && state->dmr_so & 0x40)
-    {
-      state->payload_algid = 0x21;
-      state->payload_keyid = 0xFF;
-    }
-    if (slot == 1 && state->dmr_soR & 0x40)
-    {
-      state->payload_algidR = 0x21;
-      state->payload_keyidR = 0xFF;
-    }
-  }
-  
  //collect our fragments and place them into storage
  state->late_entry_mi_fragment[slot][vc][0] = (uint64_t)ConvertBitIntoBytes(&ambe_fr[3][0], 4);
  state->late_entry_mi_fragment[slot][vc][1] = (uint64_t)ConvertBitIntoBytes(&ambe_fr2[3][0], 4);
@@ -46,8 +29,8 @@ void dmr_late_entry_mi (dsd_opts * opts, dsd_state * state)

  uint8_t slot = state->currentslot;
  int i, j;
-  int g[3]; 
-  unsigned char mi_go_bits[24]; 
+  int g[3];
+  unsigned char mi_go_bits[24];

  uint64_t mi_test = 0;
  uint64_t go_test = 0;
@@ -59,7 +42,7 @@ void dmr_late_entry_mi (dsd_opts * opts, dsd_state * state)
  uint8_t mi_crc_cmp = 0;
  uint8_t mi_crc_ext = 1;
  uint8_t mi_crc_ok = 0;
-  
+
  mi_test = (state->late_entry_mi_fragment[slot][1][0] << 32L) | (state->late_entry_mi_fragment[slot][2][0] << 28) | (state->late_entry_mi_fragment[slot][3][0] << 24) |
            (state->late_entry_mi_fragment[slot][1][1] << 20) | (state->late_entry_mi_fragment[slot][2][1] << 16) | (state->late_entry_mi_fragment[slot][3][1] << 12) |
            (state->late_entry_mi_fragment[slot][1][2] << 8)  | (state->late_entry_mi_fragment[slot][2][2] << 4)  | (state->late_entry_mi_fragment[slot][3][2] << 0);
@@ -72,8 +55,8 @@ void dmr_late_entry_mi (dsd_opts * opts, dsd_state * state)
  {
    for (i = 0; i < 12; i++)
    {
-      mi_go_bits[i] = (( mi_test << (i+j*12) ) & 0x800000000) >> 35; 
-      mi_go_bits[i+12] = (( go_test << (i+j*12) ) & 0x800000000) >> 35; 
+      mi_go_bits[i] = (( mi_test << (i+j*12) ) & 0x800000000) >> 35;
+      mi_go_bits[i+12] = (( go_test << (i+j*12) ) & 0x800000000) >> 35;
    }
    //execute golay decode and assign pass or fail to g
    if ( Golay_24_12_decode(mi_go_bits) ) g[j] = 1;
@@ -90,7 +73,7 @@ void dmr_late_entry_mi (dsd_opts * opts, dsd_state * state)
    }
  }

-  int mi_final = 0; 
+  unsigned long long int mi_final = 0;
  mi_final = (mi_corrected >> 4) & 0xFFFFFFFF;

  mi_crc_ext = (uint8_t)ConvertBitIntoBytes(&mi_bits[32], 4);
@@ -105,45 +88,102 @@ void dmr_late_entry_mi (dsd_opts * opts, dsd_state * state)
  {
    if (slot == 0 && state->payload_algid != 0)
    {
-      if (state->payload_mi != mi_final) 
+      if (state->payload_mi != mi_final)
      {
        fprintf (stderr, "%s", KCYN);
-        fprintf (stderr, " Slot 1 PI/LFSR and Late Entry MI Mismatch - %08X : %08X ", state->payload_mi, mi_final);
+        fprintf (stderr, " Slot 1 PI/LFSR and Late Entry MI Mismatch - %08llX : %08llX ", state->payload_mi, mi_final);
        if (mi_crc_ok == 1) state->payload_mi = mi_final;
        if (mi_crc_ok == 1) fprintf (stderr, "(CRC OK)");
        else fprintf (stderr, "(CRC ERR)");
        fprintf (stderr, "\n");
        fprintf (stderr, "%s", KNRM);
      }
-      //run afterwards, or le verification won't match up properly
-      if (state->payload_algid != 0x21)
+
+      //run expansions afterwards, or le verification won't match up properly
+
+      //DES1
+      if (state->payload_algid == 0x22)
      {
        LFSR64 (state);
        fprintf (stderr, "\n");
-      } 
+      }
+
+      //AES-128 or AES-256
+      if (state->payload_algid == 0x24 || state->payload_algid == 0x25)
+      {
+        LFSR128d (state);
+        fprintf (stderr, "\n");
+      }
+
    }
    if (slot == 1 && state->payload_algidR != 0)
    {
      if (state->payload_miR != mi_final)
      {
        fprintf (stderr, "%s", KCYN);
-        fprintf (stderr, " Slot 2 PI/LFSR and Late Entry MI Mismatch - %08X : %08X ", state->payload_miR, mi_final);
+        fprintf (stderr, " Slot 2 PI/LFSR and Late Entry MI Mismatch - %08llX : %08llX ", state->payload_miR, mi_final);
        if (mi_crc_ok == 1) state->payload_miR = mi_final;
        if (mi_crc_ok == 1) fprintf (stderr, "(CRC OK)");
        else fprintf (stderr, "(CRC ERR)");
        fprintf (stderr, "\n");
        fprintf (stderr, "%s", KNRM);
      }
-      //run afterwards, or le verification won't match up properly
-      if (state->payload_algidR != 0x21)
+
+      //run expansions afterwards, or le verification won't match up properly
+
+      //DES1
+      if (state->payload_algidR == 0x22)
      {
        LFSR64 (state);
        fprintf (stderr, "\n");
-      } 
+      }
+
+      //AES-128 or AES-256
+      if (state->payload_algidR == 0x24 || state->payload_algidR == 0x25)
+      {
+        LFSR128d (state);
+        fprintf (stderr, "\n");
+      }
+
    }

  }

+  //run LFSR even if golay fails
+  else if (slot == 0 && state->payload_algid != 0)
+  {
+    //DES1
+    if (state->payload_algid == 0x22)
+    {
+      LFSR64 (state);
+      fprintf (stderr, "\n");
+    }
+
+    //AES-128 or AES-256
+    if (state->payload_algid == 0x24 || state->payload_algid == 0x25)
+    {
+      LFSR128d (state);
+      fprintf (stderr, "\n");
+    }
+  }
+  else if (slot == 1 && state->payload_algidR != 0)
+  {
+    //DES1
+    if (state->payload_algidR == 0x22)
+    {
+      LFSR64 (state);
+      fprintf (stderr, "\n");
+    }
+
+    //AES-128 or AES-256
+    if (state->payload_algidR == 0x24 || state->payload_algidR == 0x25)
+    {
+      LFSR128d (state);
+      fprintf (stderr, "\n");
+    }
+  }
+
+
 }

 void dmr_alg_refresh (dsd_opts * opts, dsd_state * state)
@@ -154,7 +194,7 @@ void dmr_alg_refresh (dsd_opts * opts, dsd_state * state)
  {
    state->dropL = 256;

-    if (state->K1 != 0) 
+    if (state->K1 != 0)
    {
      state->DMRvcL = 0;
    }
@@ -164,14 +204,44 @@ void dmr_alg_refresh (dsd_opts * opts, dsd_state * state)
      LFSR (state);
      fprintf (stderr, "\n");
    }
-    //LFSR64 carried out after LE verification in order to keep it from constantly resetting the MI to the previous value
+
+    //LFSR64/128 carried out after LE verification in order to keep it from constantly resetting the MI to the previous value
+
+    if (state->payload_algid == 0x02)
+    {
+      state->DMRvcL = 0;
+      //LFSR already calculated, just dump it now
+      fprintf (stderr, "%s", KYEL);
+      fprintf (stderr, " Slot 1");
+      fprintf (stderr, " DMR PI C- ALG ID: %02X; KEY ID: %02X;", state->payload_algid, state->payload_keyid);
+      fprintf (stderr, " MI(40): %010llX;", state->payload_mi);
+      fprintf (stderr, " Hytera Enhanced;");
+      fprintf (stderr, "%s\n", KNRM);
+    }
+
+    if (state->payload_algid == 0x35 || state->payload_algid == 0x36 || state->payload_algid == 0x37)
+    {
+      state->DMRvcL = 0;
+      state->payload_mi = kirisun_lfsr(state->payload_mi);
+      fprintf (stderr, "%s", KYEL);
+      fprintf (stderr, " Slot 1");
+      fprintf (stderr, " DMR PI C- ALG ID: %02X; KEY ID: %02X;", state->payload_algid, state->payload_keyid);
+      fprintf (stderr, " MI(32): %08llX;", state->payload_mi);
+      fprintf (stderr, " Kirisun");
+      if (state->payload_algid == 0x36)
+        fprintf (stderr, " Advanced;");
+      else if (state->payload_algid == 0x37)
+        fprintf (stderr, " Universal;");
+      else fprintf (stderr, " Encryption;");
+      fprintf (stderr, "%s\n", KNRM);
+    }

  }
  if (state->currentslot == 1)
  {
    state->dropR = 256;

-    if (state->K1 != 0) 
+    if (state->K1 != 0)
    {
      state->DMRvcR = 0;
    }
@@ -181,7 +251,37 @@ void dmr_alg_refresh (dsd_opts * opts, dsd_state * state)
      LFSR (state);
      fprintf (stderr, "\n");
    }
-    //LFSR64 carried out after LE verification in order to keep it from constantly resetting the MI to the previous value
+
+    //LFSR64/128 carried out after LE verification in order to keep it from constantly resetting the MI to the previous value
+
+    if (state->payload_algidR == 0x02)
+    {
+      state->DMRvcR = 0;
+      //LFSR already calculated, just dump it now
+      fprintf (stderr, "%s", KYEL);
+      fprintf (stderr, " Slot 2");
+      fprintf (stderr, " DMR PI C- ALG ID: %02X; KEY ID: %02X;", state->payload_algidR, state->payload_keyidR);
+      fprintf (stderr, " MI(40): %010llX;", state->payload_miR);
+      fprintf (stderr, " Hytera Enhanced;");
+      fprintf (stderr, "%s\n", KNRM);
+    } 
+
+    if (state->payload_algidR == 0x35 || state->payload_algidR == 0x36 || state->payload_algidR == 0x37)
+    {
+      state->DMRvcR = 0;
+      state->payload_miR = kirisun_lfsr(state->payload_miR);
+      fprintf (stderr, "%s", KYEL);
+      fprintf (stderr, " Slot 2");
+      fprintf (stderr, " DMR PI C- ALG ID: %02X; KEY ID: %02X;", state->payload_algidR, state->payload_keyidR);
+      fprintf (stderr, " MI(32): %08llX;", state->payload_miR);
+      fprintf (stderr, " Kirisun");
+      if (state->payload_algidR == 0x36)
+        fprintf (stderr, " Advanced;");
+      else if (state->payload_algidR == 0x37)
+        fprintf (stderr, " Universal;");
+      else fprintf (stderr, " Encryption;");
+      fprintf (stderr, "%s\n", KNRM);
+    }

  }

@@ -194,12 +294,12 @@ void dmr_alg_reset (dsd_opts * opts, dsd_state * state)
  state->dropL = 256;
  state->dropR = 256;
  state->DMRvcL = 0;
-  state->DMRvcR = 0; 
-  state->payload_miP = 0;
-  state->payload_miN = 0; 
+  state->DMRvcR = 0;
+  // state->payload_miP = 0; //running these clears out before we can create a new keystream
+  // state->payload_miN = 0; //running these clears out before we can create a new keystream
 }

-//handle Single Burst (Voice Burst F) or Reverse Channel Signalling 
+//handle Single Burst (Voice Burst F) or Reverse Channel Signalling
 void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
 {
  int i;
@@ -218,7 +318,7 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
  uint8_t crc3_okay = 0; //TXI
  uint8_t txi = 0; //SEE: https://patents.google.com/patent/US8271009B2
  UNUSED(txi);
-  
+
  //NOTE: Any previous mentions to Cap+ in this area may have been in error,
  //The signalling observed here was actually TXI information, not Cap+ Specifically

@@ -241,7 +341,7 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
  //arrange the return for proper order for the crc3 check
  for (i = 0; i < 8; i++) sbrc_retcrc[i] = sbrc_return[i+3];

-  //RC Channel CRC 7 Mask = 0x7A; CRC bits are used as privacy indicators on 
+  //RC Channel CRC 7 Mask = 0x7A; CRC bits are used as privacy indicators on
  //Single Voice Burst F (see below), other moto values seem to exist there as well -- See TXI patent
  if (power == 1) //RC
  {
@@ -263,7 +363,7 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
      crc_extracted = crc_extracted << 1;
      crc_extracted = crc_extracted | sbrc_return[i]; //first 3 most significant bits
    }
-    crc_computed = crc3((uint8_t *) sbrc_retcrc, 8); //working now seems consistent as well 
+    crc_computed = crc3((uint8_t *) sbrc_retcrc, 8); //working now seems consistent as well
    if (crc_extracted == crc_computed) crc3_okay = 1;
    // fprintf (stderr, " CRC EXT %02X, CRC CMP %02X", crc_extracted, crc_computed);
  }
@@ -284,7 +384,7 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
      fprintf (stderr, "%d", sbrc_return[i]);
    fprintf (stderr, " - %03X; ", sbrc_hex);
    fprintf (stderr, "%s", KNRM);
-    
+
    // if (crc_okay == 0) //forego this since the crc can vary or not be used at all
    // {
    //   fprintf (stderr, "%s", KRED);
@@ -295,7 +395,7 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)

    fprintf (stderr, "\n");
  }
-  
+
  uint8_t sbrc_opcode = sbrc_hex & 0x7; //opcode and alg the same bits, but the alg is present when CRC is bad (I know they are limited on bits, but I hate that idea)
  uint8_t alg = sbrc_hex & 0x7; //SEE: https://patents.google.com/patent/EP2347540B1/en
  uint8_t key = (sbrc_hex >> 3) & 0xFF;
@@ -307,6 +407,41 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
  //NOTE: on above, I belive that we need to check by opcode as well, as a CRC3 can have multiple collisions
  //so we need to exclude op/alg 0 and 3 from the check (does algID 0x03/0x23 even exist?)

+  //Kirisun Placeholder
+  if (opts->dmr_le == 3)
+  {
+    if (irr_err != 0)
+    {
+      uint32_t sbrcpl = 0;
+      for(i = 0; i < 32; i++)
+      {
+        sbrcpl = sbrcpl << 1;
+        sbrcpl |= sbrc_interleaved[i] & 1;
+      }
+      if (opts->payload == 0) fprintf (stderr, "\n");
+      fprintf (stderr, "%s SLOT %d SB/RC (FEC ERR) E:%d; I:%08X D:%03X; %s ", KRED, slot+1, irr_err, sbrcpl, sbrc_hex, KNRM);
+      if (opts->payload == 1) fprintf (stderr, "\n");
+    }
+    else if (irr_err == 0 && sbrc_hex != 0) //first batch had sbrc_hex 0x5F1, second batch had 0x5E1 instead, what changed?
+    {
+      fprintf (stderr, "\n");
+      fprintf (stderr, "%s", KCYN);
+      fprintf (stderr, " Slot %d", state->currentslot+1);
+      fprintf (stderr, " DMR LE SB Kirisun Encryption Identifier;");
+      fprintf (stderr, "%s ", KNRM);
+      if (state->currentslot == 0)
+      {
+        if (state->payload_algid == 0 && state->dmr_so & 0x40)
+          state->payload_algid = 0x35; //placeholder value
+      }
+      else
+      {
+        if (state->payload_algidR == 0  && state->dmr_soR & 0x40)
+          state->payload_algidR = 0x35; //placeholder value
+      }
+    }
+  }
+
  if (opts->dmr_le == 1)
  {
    if (irr_err != 0)
@@ -344,7 +479,8 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
        else if (sbrc_hex == 5) fprintf (stderr, " RC: Cease Transmission Request;");
        else                    fprintf (stderr, " RC: Reserved %02X;", sbrc_hex);
        fprintf (stderr, "%s", KNRM);
-        if (opts->payload == 1) fprintf (stderr, "\n");
+        // if (opts->payload == 1)
+          fprintf (stderr, "\n");
      }

      //if the call is interruptable (TXI) and the crc3 is okay and TXI Opcode
@@ -355,7 +491,7 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
        fprintf (stderr, "%s", KCYN);
        fprintf (stderr, " TXI Op: %X -", sbrc_opcode);
        if      (sbrc_opcode == 0) fprintf (stderr, " Null; ");
-        else if (sbrc_opcode == 3) 
+        else if (sbrc_opcode == 3)
        {
          if (txi_delay != 0)
            fprintf (stderr, " BR Delay: %d - %d ms;", txi_delay, txi_delay * 30); //could also indicate number of superframes until next VC6 pre-emption
@@ -382,12 +518,16 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
          if (state->dmr_so & 0x40 && key != 0 && alg != 0)
          {
            //if we aren't forcing a particular alg or privacy key set
-            if (state->M == 0)
+            if (state->forced_alg_id == 0)
            {
              fprintf (stderr, "\n");
              fprintf (stderr, "%s", KCYN);
              fprintf (stderr, " Slot 1");
-              fprintf (stderr, " DMR LE SB ALG ID: 0x%02X KEY ID: 0x%02X", alg + 0x20, key);
+              fprintf (stderr, " DMR LE SB ALG ID: %02X; KEY ID: %02X;", alg + 0x20, key);
+              if (alg == 1) fprintf (stderr, " RC4;");
+              if (alg == 2) fprintf (stderr, " DES;");
+              if (alg == 4) fprintf (stderr, " AES128;");
+              if (alg == 5) fprintf (stderr, " AES256;");
              fprintf (stderr, "%s ", KNRM);
              if (opts->payload == 1) fprintf (stderr, "\n");
              if (state->payload_keyid != key)
@@ -404,12 +544,12 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
          if (state->dmr_soR & 0x40 && key != 0 && alg != 0)
          {
            //if we aren't forcing a particular alg or privacy key set
-            if (state->M == 0)
+            if (state->forced_alg_id == 0)
            {
              fprintf (stderr, "\n");
              fprintf (stderr, "%s", KCYN);
              fprintf (stderr, " Slot 2");
-              fprintf (stderr, " DMR LE SB ALG ID: 0x%02X KEY ID: 0x%02X", alg + 0x20, key);
+              fprintf (stderr, " DMR LE SB ALG ID: %02X; KEY ID: %02X;", alg + 0x20, key);
              fprintf (stderr, "%s ", KNRM);
              if (opts->payload == 1) fprintf (stderr, "\n");
              if (state->payload_keyidR != key)
@@ -449,7 +589,7 @@ uint8_t crc3(uint8_t bits[], unsigned int len)
 {
  uint8_t crc=0;
  unsigned int K = 3;
-  //x^3+x+1 
+  //x^3+x+1
  uint8_t poly[4] = {1,1,0,1};
  uint8_t buf[256];
  if (len+K > sizeof(buf)) {
@@ -473,7 +613,7 @@ uint8_t crc4(uint8_t bits[], unsigned int len)
 {
  uint8_t crc=0;
  unsigned int K = 4;
-  //x^4+x+1 
+  //x^4+x+1
  uint8_t poly[5] = {1,0,0,1,1};
  uint8_t buf[256];
  if (len+K > sizeof(buf)) {
--- a/src/dmr_ms.c
+++ b/src/dmr_ms.c
@@ -9,6 +9,8 @@
 #include "dsd.h"
 #include "dmr_const.h"

+// #define PRINT_AMBE72 //enable to view 72-bit AMBE codewords
+
 //A subroutine for processing MS voice
 void dmrMS (dsd_opts * opts, dsd_state * state)
 {
@@ -35,7 +37,7 @@ void dmrMS (dsd_opts * opts, dsd_state * state)
  memset (emb_pdu, 0, sizeof(emb_pdu));

  //cach
-  char cachdata[25]; 
+  char cachdata[25];

  //cach tact bits
  uint8_t tact_bits[7];
@@ -65,7 +67,7 @@ void dmrMS (dsd_opts * opts, dsd_state * state)
  //Note: Manual dibit inversion required here since I didn't seperate inverted return from normal return in framesync,
  //so getDibit doesn't know to invert it before it gets here

-  for (j = 0; j < 6; j++) { 
+  for (j = 0; j < 6; j++) {
  state->dmrburstL = 16;

  memset (ambe_fr, 0, sizeof(ambe_fr));
@@ -165,9 +167,19 @@ void dmrMS (dsd_opts * opts, dsd_state * state)

  }

+  //Kirisun Check VC-F for Enc Identifiers -- has bad fec, unless its loaded differently
+  //SEE: https://patents.google.com/patent/CN102307075A/en?q=(kirisun)&q=(dmr)&oq=kirisun
+  // if (opts->dmr_le == 3 && vc == 6)
+  // {
+  //   bool kokay = 0;
+  //   // kokay = Golay_24_12_decode(syncdata);
+  //   unsigned long long int kirisun = (unsigned long long int)ConvertBitIntoBytes(&syncdata[0], 48);
+  //   fprintf (stderr, "Kiri: %012llX; Golay Okay: %d; \n", kirisun, kokay);
+  // }
+
  for(i = 0; i < 8; i++) emb_pdu[i + 0] = syncdata[i];
  for(i = 0; i < 8; i++) emb_pdu[i + 8] = syncdata[i + 40];
-  
+
  emb_ok = -1;
  if(QR_16_7_6_decode(emb_pdu))
  {
@@ -237,44 +249,46 @@ void dmrMS (dsd_opts * opts, dsd_state * state)

  memcpy (ambe_fr4, ambe_fr2, sizeof(ambe_fr2));

-  //copy ambe_fr frames first, running process mbe will correct them, 
-  //but this also leads to issues extracting good le mi values when 
+  //copy ambe_fr frames first, running process mbe will correct them,
+  //but this also leads to issues extracting good le mi values when
  //we go to do correction on them there too
  memcpy (m1, ambe_fr, sizeof(m1));
  memcpy (m2, ambe_fr2, sizeof(m2));
  memcpy (m3, ambe_fr3, sizeof(m3));

-  if (state->directmode == 0)
+  if (state->tyt_bp == 1)
  {
-    processMbeFrame (opts, state, NULL, ambe_fr, NULL);
-      memcpy(state->f_l4[0], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
-    processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
-      memcpy(state->f_l4[1], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
-    processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
-      memcpy(state->f_l4[2], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[2], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[2], state->s_lu, sizeof(state->s_lu));
+    tyt16_ambe2_codeword_keystream(state, ambe_fr, 0);
+    tyt16_ambe2_codeword_keystream(state, ambe_fr2, 1);
+    tyt16_ambe2_codeword_keystream(state, ambe_fr3, 0);
  }
-  else
+
+  if (state->csi_ee == 1)
  {
-    processMbeFrame (opts, state, NULL, ambe_fr4, NULL); //play duplicate of 2 here to smooth audio on tdma direct
-      memcpy(state->f_l4[0], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
-    processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
-      memcpy(state->f_l4[1], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
-    processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
-      memcpy(state->f_l4[2], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[2], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[2], state->s_lu, sizeof(state->s_lu));
+    csi72_ambe2_codeword_keystream(state, ambe_fr);
+    csi72_ambe2_codeword_keystream(state, ambe_fr2);
+    csi72_ambe2_codeword_keystream(state, ambe_fr3);
  }

+  #ifdef PRINT_AMBE72
+  ambe2_codeword_print_i(opts, ambe_fr);
+  ambe2_codeword_print_i(opts, ambe_fr2);
+  ambe2_codeword_print_i(opts, ambe_fr3);
+  #endif
+
+  processMbeFrame (opts, state, NULL, ambe_fr, NULL);
+    memcpy(state->f_l4[0], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
+    memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
+    memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
+  processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
+    memcpy(state->f_l4[1], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
+    memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
+    memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
+  processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
+    memcpy(state->f_l4[2], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
+    memcpy(state->s_l4[2], state->s_l, sizeof(state->s_l));
+    memcpy(state->s_l4u[2], state->s_lu, sizeof(state->s_lu));
+
  //TODO: Consider copying f_l to f_r for left and right channel saturation on MS mode
  if (opts->floating_point == 0)
  {
@@ -283,7 +297,7 @@ void dmrMS (dsd_opts * opts, dsd_state * state)
      playSynthesizedVoiceSS3(opts, state);
  }

-  if (opts->floating_point == 1) 
+  if (opts->floating_point == 1)
  {
    // memcpy (state->f_r4, state->f_l4, sizeof(state->f_l4));
    if(opts->pulse_digi_out_channels == 2)
@@ -292,16 +306,21 @@ void dmrMS (dsd_opts * opts, dsd_state * state)

  if (vc == 6)
  {
+    //this needs to run prior to embedded link control
+    if (state->payload_algid == 0x02)
+        hytera_enhanced_alg_refresh(state);
+    
    dmr_data_burst_handler(opts, state, (uint8_t *)dummy_bits, 0xEB);
    //check the single burst/reverse channel opportunity
    dmr_sbrc (opts, state, power);
-    
+
    fprintf (stderr, "\n");
    dmr_alg_refresh (opts, state);
  }

  //collect the mi fragment
-  dmr_late_entry_mi_fragment (opts, state, vc, m1, m2, m3);
+  if (opts->dmr_le != 2) //if not Hytera Enhanced
+    dmr_late_entry_mi_fragment (opts, state, vc, m1, m2, m3);

  //errors in ms/mono since we skip the other slot
  // cach_err = dmr_cach (opts, state, cachdata);
@@ -310,14 +329,14 @@ void dmrMS (dsd_opts * opts, dsd_state * state)
  state->last_vc_sync_time = time(NULL);

  vc++;
-  
+
  //reset emb components
  cc = 25;
  power = 9; //power and pre-emption indicator
  lcss = 9;

  //this is necessary because we need to skip and collect dibits, not just skip them
-  if (vc > 6) goto END; 
+  if (vc > 6) goto END;

  skipDibit (opts, state, 144); //skip to next tdma channel

@@ -327,6 +346,10 @@ void dmrMS (dsd_opts * opts, dsd_state * state)
    ncursesPrinter(opts, state);
  }

+  //slot 1
+  watchdog_event_history(opts, state, 0);
+  watchdog_event_current(opts, state, 0);
+
 } // end loop

 END:
@@ -355,6 +378,9 @@ void dmrMS (dsd_opts * opts, dsd_state * state)
  timestr = NULL;
 }

+ //reset static ks counter
+ state->static_ks_counter[0] = 0;
+
 }

 //collect buffered 1st half and get 2nd half voice payload and then jump to full MS Voice decoding.
@@ -363,6 +389,9 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)

  char * timestr = getTimeC();

+  //reset static ks counter
+  state->static_ks_counter[0] = 0;
+
  int i, dibit;
  int *dibit_p;

@@ -383,10 +412,10 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)
  const int *w, *x, *y, *z;

  //cach
-  char cachdata[25]; 
+  char cachdata[25];
  UNUSED(cachdata);

-  state->dmrburstL = 16; 
+  state->dmrburstL = 16;
  state->currentslot = 0; //force to slot 0

  dibit_p = state->dmr_payload_p - 90;
@@ -538,44 +567,45 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)

  memcpy (ambe_fr4, ambe_fr2, sizeof(ambe_fr2));

-  //copy ambe_fr frames first, running process mbe will correct them, 
-  //but this also leads to issues extracting good le mi values when 
+  //copy ambe_fr frames first, running process mbe will correct them,
+  //but this also leads to issues extracting good le mi values when
  //we go to do correction on them there too
  memcpy (m1, ambe_fr, sizeof(m1));
  memcpy (m2, ambe_fr2, sizeof(m2));
  memcpy (m3, ambe_fr3, sizeof(m3));

-  if (state->directmode == 0)
+  if (state->tyt_bp == 1)
  {
-    processMbeFrame (opts, state, NULL, ambe_fr, NULL);
-      memcpy(state->f_l4[0], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
-    processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
-      memcpy(state->f_l4[1], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
-    processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
-      memcpy(state->f_l4[2], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[2], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[2], state->s_lu, sizeof(state->s_lu));
-  }
-  else
-  {
-    processMbeFrame (opts, state, NULL, ambe_fr4, NULL); //play duplicate of 2 here to smooth audio on tdma direct
-      memcpy(state->f_l4[0], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
-    processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
-      memcpy(state->f_l4[1], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
-    processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
-      memcpy(state->f_l4[2], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[2], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[2], state->s_lu, sizeof(state->s_lu));
+    tyt16_ambe2_codeword_keystream(state, ambe_fr, 0);
+    tyt16_ambe2_codeword_keystream(state, ambe_fr2, 1);
+    tyt16_ambe2_codeword_keystream(state, ambe_fr3, 0);
  }

+  if (state->csi_ee == 1)
+  {
+    csi72_ambe2_codeword_keystream(state, ambe_fr);
+    csi72_ambe2_codeword_keystream(state, ambe_fr2);
+    csi72_ambe2_codeword_keystream(state, ambe_fr3);
+  }
+
+  #ifdef PRINT_AMBE72
+  ambe2_codeword_print_i(opts, ambe_fr);
+  ambe2_codeword_print_i(opts, ambe_fr2);
+  ambe2_codeword_print_i(opts, ambe_fr3);
+  #endif
+
+  processMbeFrame (opts, state, NULL, ambe_fr, NULL);
+    memcpy(state->f_l4[0], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
+    memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
+    memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
+  processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
+    memcpy(state->f_l4[1], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
+    memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
+    memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
+  processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
+    memcpy(state->f_l4[2], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
+    memcpy(state->s_l4[2], state->s_l, sizeof(state->s_l));
+    memcpy(state->s_l4u[2], state->s_lu, sizeof(state->s_lu));

  //TODO: Consider copying f_l to f_r for left and right channel saturation on MS mode
  if (opts->floating_point == 0)
@@ -585,7 +615,7 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)
      playSynthesizedVoiceSS3(opts, state);
  }

-  if (opts->floating_point == 1) 
+  if (opts->floating_point == 1)
  {
    // memcpy (state->f_r4, state->f_l4, sizeof(state->f_l4));
    if(opts->pulse_digi_out_channels == 2)
@@ -593,7 +623,8 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)
  }

  //collect the mi fragment
-  dmr_late_entry_mi_fragment (opts, state, 1, m1, m2, m3);
+  if (opts->dmr_le != 2) //if not Hytera Enhanced
+    dmr_late_entry_mi_fragment (opts, state, 1, m1, m2, m3);

  //errors due to skipping other slot
  // cach_err = dmr_cach (opts, state, cachdata);
--- a/src/dmr_pdu.c
+++ b/src/dmr_pdu.c
--- a/src/dmr_pi.c
+++ b/src/dmr_pi.c
@@ -7,14 +7,15 @@
 * LWVMOBILE
 * 2022-12 DSD-FME Florida Man Edition
 *-----------------------------------------------------------------------------*/
- 
+
 #include "dsd.h"

 void dmr_pi (dsd_opts * opts, dsd_state * state, uint8_t PI_BYTE[], uint32_t CRCCorrect, uint32_t IrrecoverableErrors)
 {
-  UNUSED2(opts, CRCCorrect);

-  if((IrrecoverableErrors == 0)) 
+  uint8_t MFID = PI_BYTE[1];
+
+  if(IrrecoverableErrors == 0)
  {

    //update cc amd vc sync time for trunking purposes (particularly Con+)
@@ -22,84 +23,267 @@ void dmr_pi (dsd_opts * opts, dsd_state * state, uint8_t PI_BYTE[], uint32_t CRC
    {
      state->last_vc_sync_time = time(NULL);
      state->last_cc_sync_time = time(NULL);
-    } 
-
-    if (state->currentslot == 0)
-    {
-      state->payload_algid = PI_BYTE[0];
-      state->payload_keyid = PI_BYTE[2];
-      state->payload_mi    = ( ((PI_BYTE[3]) << 24) + ((PI_BYTE[4]) << 16) + ((PI_BYTE[5]) << 8) + (PI_BYTE[6]) );
-      if (state->payload_algid < 0x26) 
-      {
-        fprintf (stderr, "%s ", KYEL);
-        fprintf (stderr, "\n Slot 1");
-        fprintf (stderr, " DMR PI H- ALG ID: 0x%02X KEY ID: 0x%02X MI: 0x%08X", state->payload_algid, state->payload_keyid, state->payload_mi);
-
-        //Anytone RC4 Shim
-        if (state->payload_algid == 0x01)
-        {
-          fprintf (stderr, " Anytone (0x01)");
-          state->payload_algid = 0x21;
-        }
-
-        fprintf (stderr, "%s ", KNRM);
-        if (state->payload_algid != 0x21)
-        {
-          fprintf (stderr, "\n");
-          LFSR64 (state);
-        } 
-      }
-
-      if (state->payload_algid >= 0x26)
-      {
-        state->payload_algid = 0;
-        state->payload_keyid = 0;
-        state->payload_mi = 0;
-      }
    }

-    if (state->currentslot == 1)
+    if (MFID == 0x0A && CRCCorrect == 1) //Kirisun
    {
+      uint8_t so  = PI_BYTE[2]; //in VLC and PI, this byte is 0x40, so thinking this could be SVC_OPT
+      uint8_t alg = PI_BYTE[0]; //observed 0x36 and 0x37 for Kirisun Advanced and Universal Privacy
+      // uint8_t kid = PI_BYTE[2]; //user info conveyed there is only 16 allotments for Key, and keys are channel specific, so no key id value
+      uint32_t target = ((unsigned long long int)PI_BYTE[7] << 16) | ((unsigned long long int)PI_BYTE[8] << 8)  | ((unsigned long long int)PI_BYTE[9] << 0);

-      state->payload_algidR = PI_BYTE[0];
-      state->payload_keyidR = PI_BYTE[2];
-      state->payload_miR    = ( ((PI_BYTE[3]) << 24) + ((PI_BYTE[4]) << 16) + ((PI_BYTE[5]) << 8) + (PI_BYTE[6]) );
-      if (state->payload_algidR < 0x26) 
+      //TODO: Use ALG and TGT value here to produce a key id via hashing it
+      uint8_t hash = alg * target % 256; //more complex hash later (honestly, probably not)
+
+      //MI only appears to be 32-bit
+      uint32_t mi = ((uint32_t)PI_BYTE[3] << 24) | ((uint32_t)PI_BYTE[4] << 16) | 
+                    ((uint32_t)PI_BYTE[5] << 8)  | ((uint32_t)PI_BYTE[6] << 0);
+
+      if (state->currentslot == 0)
      {
-        fprintf (stderr, "%s ", KYEL);
-        fprintf (stderr, "\n Slot 2");
-        fprintf (stderr, " DMR PI H- ALG ID: 0x%02X KEY ID: 0x%02X MI: 0x%08X", state->payload_algidR, state->payload_keyidR, state->payload_miR);
-
-        //Anytone RC4 Shim
-        if (state->payload_algidR == 0x01)
-        {
-          fprintf (stderr, " Anytone (0x01)");
-          state->payload_algidR = 0x21;
-        }
-
-        fprintf (stderr, "%s ", KNRM);
-        if (state->payload_algidR != 0x21)
-        {
-          fprintf (stderr, "\n");
-          LFSR64 (state);
-        } 
+        state->dmr_so = so;
+        state->payload_algid = alg; 
+        state->payload_keyid = hash;
+        state->payload_mi = mi;
+      }
+      else
+      {
+        state->dmr_soR = so;
+        state->payload_algidR = alg;
+        state->payload_keyidR = hash;
+        state->payload_miR = mi;
      }

-      if (state->payload_algidR >= 0x26)
-      {
-        state->payload_algidR = 0;
-        state->payload_keyidR = 0;
-        state->payload_miR = 0;
-      }
+      fprintf (stderr, "%s ", KYEL);
+      fprintf (stderr, "\n Slot %d", state->currentslot+1);
+      fprintf (stderr, " DMR PI H- ALG ID: %02X; KEY ID: %02X; MI(32): %08X;", alg, hash, mi);
+
+      fprintf (stderr, " Kirisun ");
+      if (alg == 0x36)
+        fprintf (stderr, "Advanced;");
+      else if (alg == 0x37)
+        fprintf (stderr, "Universal;");
+      else fprintf (stderr, "Encryption;");
+      fprintf (stderr, "%s", KNRM);
+
+      //disable late entry for DMRA, Flag 3 for future check of VC-F 48-bit region with Golay 24,12 Encoding
+      //SEE: https://patents.google.com/patent/CN102307075A/en?q=(kirisun)&q=(dmr)&oq=kirisun
+      //tested patent above with information provided, VC-F had a SB, but the 48-bit
+      //full value yielded bad Golay results, and user submitted info contradicts this patent for samples provided
+      //Late Entry MI does appear to work, however, and reports a good CRC for that as well,
+      //reverse engineered LFSR for Kirisun lines up with the late entry for 32-bit MI values.
+      opts->dmr_le = 3;

    }

+    if (MFID == 0x68) //Hytera Enhanced
+    {
+      if (state->currentslot == 0)
+      {
+        state->dmr_so |= 0x40; //OR the enc bit onto the SO
+        state->payload_algid = PI_BYTE[0];
+        state->payload_keyid = PI_BYTE[2];
+        state->payload_mi = ((unsigned long long int)PI_BYTE[3] << 32ULL) | ((unsigned long long int)PI_BYTE[4] << 24) | 
+        ((unsigned long long int)PI_BYTE[5] << 16) | ((unsigned long long int)PI_BYTE[6] << 8) | ((unsigned long long int)PI_BYTE[7] << 0);
+      }
+      else
+      {
+        state->dmr_soR |= 0x40; //OR the enc bit onto the SO
+        state->payload_algidR = PI_BYTE[0];
+        state->payload_keyidR = PI_BYTE[2];
+        state->payload_miR = ((unsigned long long int)PI_BYTE[3] << 32ULL) | ((unsigned long long int)PI_BYTE[4] << 24) | 
+        ((unsigned long long int)PI_BYTE[5] << 16) | ((unsigned long long int)PI_BYTE[6] << 8) | ((unsigned long long int)PI_BYTE[7] << 0);
+      }
+
+      fprintf (stderr, "%s ", KYEL);
+      fprintf (stderr, "\n Slot %d", state->currentslot+1);
+      fprintf (stderr, " DMR PI H- ALG ID: %02X; KEY ID: %02X; MI(40): %02X%02X%02X%02X%02X;", 
+      PI_BYTE[0], PI_BYTE[2], PI_BYTE[3], PI_BYTE[4], PI_BYTE[5], PI_BYTE[6], PI_BYTE[7]);
+
+      //PI_BYTE[9] is a checksum of the other bytes combined
+      uint8_t checksum = 0;
+      for (int i = 0; i < 9; i++)
+      {
+        checksum += PI_BYTE[i];
+        checksum &= 0xFF;
+      }
+      checksum = ~checksum & 0xFF;
+      checksum++;
+
+      //debug
+      // fprintf (stderr, " CHK: %02X / %02X;", checksum, PI_BYTE[9]);
+
+      if (checksum == PI_BYTE[9])
+      {
+        fprintf (stderr, " Hytera Enhanced; ");
+
+        if (state->currentslot == 0 && state->R != 0)
+          fprintf (stderr, "Key: %010llX; ", state->R);
+
+        if (state->currentslot == 1 && state->RR != 0)
+          fprintf (stderr, "Key: %010llX; ", state->RR);
+
+        //disable late entry for DMRA (hopefully, there aren't any systems running both DMRA and Hytera Enhanced mixed together)
+        opts->dmr_le = 2;
+
+        // fprintf (stderr, " (Checksum Okay);");
+      }
+      else
+      {
+        fprintf (stderr, "%s", KRED);
+        fprintf (stderr, " (Checksum Err);");
+      }
+
+      fprintf (stderr, "%s", KNRM);
+
+    }
+
+    else if (MFID == 0x10) //DMRA
+    {
+
+      if (state->currentslot == 0)
+      {
+        state->payload_algid = PI_BYTE[0];
+        state->payload_keyid = PI_BYTE[2];
+        state->payload_mi    = ((unsigned long long int)PI_BYTE[3] << 24ULL) | ((unsigned long long int)PI_BYTE[4] << 16ULL) | ((unsigned long long int)PI_BYTE[5] << 8ULL) | ((unsigned long long int)PI_BYTE[6] << 0ULL);
+        if (state->payload_algid < 0x26)
+        {
+          fprintf (stderr, "%s ", KYEL);
+          fprintf (stderr, "\n Slot 1");
+          fprintf (stderr, " DMR PI H- ALG ID: %02X; KEY ID: %02X; MI(32): %08llX;", state->payload_algid, state->payload_keyid, state->payload_mi);
+
+          //check for any values that aren't 0x2X but just 0x0X
+          //going to be very generic here to avoid any particular vendors using 0x2X and not 0x0X
+          if (state->payload_algid & 0x20)
+            fprintf (stderr, " DMRA");
+          else fprintf (stderr, " DMRA Compatible");
+            
+          if ((state->payload_algid & 0x07) == 0x01)
+          {
+            fprintf (stderr, " RC4;");
+            state->payload_algid = 0x21;
+          }
+
+          else if ((state->payload_algid & 0x07) == 0x02)
+          {
+            fprintf (stderr, " DES;");
+            state->payload_algid = 0x22;
+          }
+
+          else if ((state->payload_algid & 0x07) == 0x04)
+          {
+            fprintf (stderr, " AES-128;");
+            state->payload_algid = 0x24;
+          }
+
+          else if ((state->payload_algid & 0x07) == 0x05)
+          {
+            fprintf (stderr, " AES-256;");
+            state->payload_algid = 0x25;
+          }
+
+          fprintf (stderr, "%s ", KNRM);
+
+          //expand the 32-bit MI to a 64-bit DES IV
+          if (state->payload_algid == 0x22)
+          {
+            fprintf (stderr, "\n");
+            LFSR64 (state);
+          }
+
+          //expand the 32-bit MI to a 128-bit AES IV
+          if (state->payload_algid == 0x24 || state->payload_algid == 0x25)
+          {
+            fprintf (stderr, "\n");
+            LFSR128d (state);
+          }
+        }
+
+        if (state->payload_algid >= 0x26)
+        {
+          state->payload_algid = 0;
+          state->payload_keyid = 0;
+          state->payload_mi = 0;
+        }
+      }
+
+      if (state->currentslot == 1)
+      {
+
+        state->payload_algidR = PI_BYTE[0];
+        state->payload_keyidR = PI_BYTE[2];
+        state->payload_miR    = ((unsigned long long int)PI_BYTE[3] << 24ULL) | ((unsigned long long int)PI_BYTE[4] << 16ULL) | ((unsigned long long int)PI_BYTE[5] << 8ULL) | ((unsigned long long int)PI_BYTE[6] << 0ULL);
+        if (state->payload_algidR < 0x26)
+        {
+          fprintf (stderr, "%s ", KYEL);
+          fprintf (stderr, "\n Slot 2");
+          fprintf (stderr, " DMR PI H- ALG ID: %02X; KEY ID: %02X; MI(32): %08llX;", state->payload_algidR, state->payload_keyidR, state->payload_miR);
+
+          //check for any values that aren't 0x2X but just 0x0X
+          //going to be very generic here to avoid any particular vendors using 0x2X and not 0x0X
+          if (state->payload_algidR & 0x20)
+            fprintf (stderr, " DMRA");
+          else fprintf (stderr, " DMRA Compatible");
+            
+          if ((state->payload_algidR & 0x07) == 0x01)
+          {
+            fprintf (stderr, " RC4;");
+            state->payload_algidR = 0x21;
+          }
+
+          else if ((state->payload_algidR & 0x07) == 0x02)
+          {
+            fprintf (stderr, " DES;");
+            state->payload_algidR = 0x22;
+          }
+
+          else if ((state->payload_algidR & 0x07) == 0x04)
+          {
+            fprintf (stderr, " AES-128;");
+            state->payload_algidR = 0x24;
+          }
+
+          else if ((state->payload_algidR & 0x07) == 0x05)
+          {
+            fprintf (stderr, " AES-256;");
+            state->payload_algidR = 0x25;
+          }
+
+
+          fprintf (stderr, "%s ", KNRM);
+
+          //expand the 32-bit MI to a 64-bit DES IV
+          if (state->payload_algidR == 0x22)
+          {
+            fprintf (stderr, "\n");
+            LFSR64 (state);
+          }
+
+          //expand the 32-bit MI to a 128-bit AES IV
+          if (state->payload_algidR == 0x24 || state->payload_algidR == 0x25)
+          {
+            fprintf (stderr, "\n");
+            LFSR128d (state);
+          }
+        }
+
+        if (state->payload_algidR >= 0x26)
+        {
+          state->payload_algidR = 0;
+          state->payload_keyidR = 0;
+          state->payload_miR = 0;
+        }
+
+      }
+
+    } //end DMRA
+
  }
 }

 void LFSR(dsd_state * state)
 {
-  int lfsr = 0;
+  unsigned long long int lfsr = 0;
  if (state->currentslot == 0)
  {
    lfsr = state->payload_mi;
@@ -111,70 +295,263 @@ void LFSR(dsd_state * state)
  for(cnt=0;cnt<32;cnt++)
  {
 	  // Polynomial is C(x) = x^32 + x^4 + x^2 + 1
-    int bit  = ((lfsr >> 31) ^ (lfsr >> 3) ^ (lfsr >> 1)) & 0x1;
-    lfsr =  (lfsr << 1) | (bit);
+    unsigned long long int bit  = ((lfsr >> 31) ^ (lfsr >> 3) ^ (lfsr >> 1)) & 0x1;
+    lfsr =  (lfsr << 1) | bit;
  }

+  lfsr &= 0xFFFFFFFF;
+
  if (state->currentslot == 0)
  {
    fprintf (stderr, "%s", KYEL);
    fprintf (stderr, " Slot 1");
-    fprintf (stderr, " DMR PI C- ALG ID: 0x%02X KEY ID: 0x%02X", state->payload_algid, state->payload_keyid);
-    fprintf(stderr, " MI: 0x%08X", lfsr);
+    fprintf (stderr, " DMR PI C- ALG ID: %02X; KEY ID: %02X;", state->payload_algid, state->payload_keyid);
+    fprintf (stderr, " MI(32): %08llX;", lfsr);
+    fprintf (stderr, " RC4;");
    fprintf (stderr, "%s", KNRM);
    state->payload_mi = lfsr;
  }

-  if (state->currentslot == 1) 
+  if (state->currentslot == 1)
  {

    fprintf (stderr, "%s", KYEL);
    fprintf (stderr, " Slot 2");
-    fprintf (stderr, " DMR PI C- ALG ID: 0x%02X KEY ID: 0x%02X", state->payload_algidR, state->payload_keyidR);
-    fprintf(stderr, " MI: 0x%08X", lfsr);
+    fprintf (stderr, " DMR PI C- ALG ID: %02X; KEY ID: %02X;", state->payload_algidR, state->payload_keyidR);
+    fprintf(stderr, " MI(32): %08llX;", lfsr);
+    fprintf (stderr, " RC4;");
    fprintf (stderr, "%s", KNRM);
    state->payload_miR = lfsr;
  }
 }

+//Expand a 32-bit MI into a 64-bit IV for DES
 void LFSR64(dsd_state * state)
 {
-	{
+  {
    unsigned long long int lfsr = 0;

-		if (state->currentslot == 0)
-		{
-			lfsr = (uint64_t) state->payload_mi; 
-		}
-    else lfsr = (uint64_t) state->payload_miR; 
+    if (state->currentslot == 0)
+    {
+      lfsr = (uint64_t) state->payload_mi;
+    }
+    else lfsr = (uint64_t) state->payload_miR;

    uint8_t cnt = 0;

-    for(cnt=0;cnt<32;cnt++) 
+    for(cnt=0;cnt<32;cnt++)
    {
-			unsigned long long int bit = ( (lfsr >> 31) ^ (lfsr >> 21) ^ (lfsr >> 1) ^ (lfsr >> 0) ) & 0x1;
+      unsigned long long int bit = ( (lfsr >> 31) ^ (lfsr >> 21) ^ (lfsr >> 1) ^ (lfsr >> 0) ) & 0x1;
      lfsr = (lfsr << 1) | bit;
    }

-		if (state->currentslot == 0)
-		{
+    if (state->currentslot == 0)
+    {
      fprintf (stderr, "%s", KYEL);
      fprintf (stderr, " Slot 1");
-      fprintf (stderr, " DMR PI C- ALG ID: 0x%02X KEY ID: 0x%02X", state->payload_algid, state->payload_keyid);
-      fprintf (stderr, " MI: 0x%016llX", lfsr);
+      fprintf (stderr, " DMR PI C- ALG ID: %02X; KEY ID: %02X;", state->payload_algid, state->payload_keyid);
+      fprintf (stderr, " MI(64): %016llX;", lfsr);
+      fprintf (stderr, " DES;");
      fprintf (stderr, "%s", KNRM);
-			state->payload_mi = lfsr & 0xFFFFFFFF; //truncate for next repitition and le verification
-		}
+      state->payload_mi = lfsr & 0xFFFFFFFF; //truncate for next repitition and le verification
+      state->payload_miP = lfsr;
+      state->DMRvcL = 0;
+    }

-		if (state->currentslot == 1)
-		{
+    if (state->currentslot == 1)
+    {
      fprintf (stderr, "%s", KYEL);
      fprintf (stderr, " Slot 2");
-      fprintf (stderr, " DMR PI C- ALG ID: 0x%02X KEY ID: 0x%02X", state->payload_algidR, state->payload_keyidR);
-      fprintf (stderr, " MI: 0x%016llX", lfsr);
+      fprintf (stderr, " DMR PI C- ALG ID: %02X; KEY ID: %02X;", state->payload_algidR, state->payload_keyidR);
+      fprintf (stderr, " MI(64): %016llX;", lfsr);
+      fprintf (stderr, " DES;");
      fprintf (stderr, "%s", KNRM);
-			state->payload_miR = lfsr & 0xFFFFFFFF; //truncate for next repitition and le verification
-		}
+      state->payload_miR = lfsr & 0xFFFFFFFF; //truncate for next repitition and le verification
+      state->payload_miN = lfsr;
+      state->DMRvcR = 0;
+    }

-	}
-}
+  }
+}
+
+
+//Expand a 32-bit MI into a 128-bit IV for AES
+void LFSR128d(dsd_state * state)
+{
+  unsigned long long int lfsr = 0;
+
+  if (state->currentslot == 0)
+    lfsr = state->payload_mi;
+  else lfsr = state->payload_miR;
+
+  unsigned long long int next_mi;
+
+  //start packing aes_iv
+  if (state->currentslot == 0)
+  {
+    state->aes_iv[0] = (lfsr >> 24) & 0xFF;
+    state->aes_iv[1] = (lfsr >> 16) & 0xFF;
+    state->aes_iv[2] = (lfsr >> 8 ) & 0xFF;
+    state->aes_iv[3] = (lfsr >> 0 ) & 0xFF;
+  }
+  else if (state->currentslot == 1)
+  {
+    state->aes_ivR[0] = (lfsr >> 24) & 0xFF;
+    state->aes_ivR[1] = (lfsr >> 16) & 0xFF;
+    state->aes_ivR[2] = (lfsr >> 8 ) & 0xFF;
+    state->aes_ivR[3] = (lfsr >> 0 ) & 0xFF;
+  }
+
+  int cnt = 0; int x = 32;
+  unsigned long long int bit;
+  for(cnt=0;cnt<96;cnt++)
+  {
+    //32,22,2,1
+    bit = ( (lfsr >> 31) ^ (lfsr >> 21) ^ (lfsr >> 1) ^ (lfsr >> 0) ) & 0x1;
+    lfsr = (lfsr << 1) | bit;
+
+    //continue packing aes_iv
+    if (state->currentslot == 0)
+      state->aes_iv[x/8] = (state->aes_iv[x/8] << 1) + bit;
+    else if (state->currentslot == 1)
+      state->aes_ivR[x/8] = (state->aes_ivR[x/8] << 1) + bit;
+    x++;
+  }
+
+  //assign the next 32-bit short MI from 4,5,6,7 so it'll match up with OTA late entry
+  if (state->currentslot == 0)
+    next_mi = ((unsigned long long int)state->aes_iv[4] << 24) | ((unsigned long long int)state->aes_iv[5] << 16) | 
+              ((unsigned long long int)state->aes_iv[6] << 8)  | ((unsigned long long int)state->aes_iv[7] << 0);
+  if (state->currentslot == 1)
+    next_mi = ((unsigned long long int)state->aes_ivR[4] << 24) | ((unsigned long long int)state->aes_ivR[5] << 16) | 
+              ((unsigned long long int)state->aes_ivR[6] << 8)  | ((unsigned long long int)state->aes_ivR[7] << 0);
+
+  if (state->currentslot == 0)
+  {
+    fprintf (stderr, "%s", KYEL);
+    fprintf (stderr, " Slot 1");
+    fprintf (stderr, " DMR PI C- ALG ID: %02X; KEY ID: %02X; MI(128): ", state->payload_algid, state->payload_keyid);
+    for (x = 0; x < 16; x++)
+      fprintf (stderr, "%02X", state->aes_iv[x]);
+    fprintf (stderr, "%s", KNRM);
+    fprintf (stderr, ";");
+
+    if (state->payload_algid == 0x24)
+      fprintf (stderr, " AES-128;");
+    else fprintf (stderr, " AES-256;");
+
+    state->payload_mi = next_mi;
+    state->DMRvcL = 0;
+
+  }
+
+  if (state->currentslot == 1)
+  {
+    fprintf (stderr, "%s", KYEL);
+    fprintf (stderr, " Slot 2");
+    fprintf (stderr, " DMR PI C- ALG ID: %02X; KEY ID: %02X; MI(128): ", state->payload_algidR, state->payload_keyidR);
+    for (x = 0; x < 16; x++)
+      fprintf (stderr, "%02X", state->aes_ivR[x]);
+    fprintf (stderr, "%s", KNRM);
+    fprintf (stderr, ";");
+    
+    if (state->payload_algidR == 0x24)
+      fprintf (stderr, " AES-128;");
+    else fprintf (stderr, " AES-256;");
+
+    state->payload_miR = next_mi;
+    state->DMRvcR = 0;
+
+  }
+
+}
+
+unsigned long long int hytera_lfsr(uint8_t * mi, uint8_t * taps, uint8_t len)
+{
+
+  for (uint8_t i = 0; i < len; i++)
+  {
+    uint8_t bit = (mi[i] >> 7) & 1;
+    mi[i] <<= 1;
+    if (bit) mi[i] ^= taps[i%len];
+    mi[i] |= bit;
+    
+  }
+
+  unsigned long long int mi_value = 0;
+  for (uint8_t i = 0; i < len; i++)
+  {
+    mi_value <<= 8;
+    mi_value |= mi[i];
+  }
+
+  //debug
+  // fprintf (stderr, " Next MI: %010llX \n", mi_value);
+
+  return mi_value;
+}
+
+void hytera_enhanced_alg_refresh(dsd_state * state)
+{
+  uint8_t mi[5]; memset (mi, 0, sizeof(mi));
+  unsigned long long int mi_value = 0;
+  if (state->currentslot == 0)
+    mi_value = state->payload_mi;
+  else mi_value = state->payload_miR;
+
+  //load mi_value into mi array
+  mi[0] = ((mi_value & 0xFF00000000) >> 32UL);
+  mi[1] = ((mi_value & 0xFF000000) >> 24);
+  mi[2] = ((mi_value & 0xFF0000) >> 16);
+  mi[3] = ((mi_value & 0xFF00) >> 8);
+  mi[4] = ((mi_value & 0xFF) >> 0);
+
+  //calculate the next MI value
+  uint8_t taps[5]; memset(taps, 0, sizeof(taps));
+
+  //the tap values
+  taps[0] = 0x12;
+  taps[1] = 0x24;
+  taps[2] = 0x48;
+  taps[3] = 0x22;
+  taps[4] = 0x14;  
+  mi_value = hytera_lfsr(mi, taps, 5);
+
+  if (state->currentslot == 0)
+    state->payload_mi = mi_value;
+  else state->payload_miR = mi_value;
+}
+
+uint32_t kirisun_lfsr(unsigned long long int mi)
+{
+
+  uint32_t taps = 0xD459C4F1;
+  uint32_t lfsr = (uint32_t)mi;
+  uint32_t new_mi = 0;
+
+  for (int i = 0; i < 4; i++) 
+  {
+
+    uint8_t byte = 0;
+
+    for (int j = 0; j < 8; j++) 
+    {
+      uint32_t temp = (lfsr << 1);
+      uint8_t  msb  = (lfsr >> 31) & 1;
+
+      if (msb) 
+      {
+        byte |= (1 << j);
+        lfsr = temp ^ taps;
+      }
+      else lfsr = temp; //was previously temp ^ 1, but that isn't a primitive
+    }
+
+    new_mi <<=8;
+    new_mi |= byte;
+
+  }
+
+  return new_mi;
+
+}
--- a/src/dmr_utils.c
+++ b/src/dmr_utils.c
@@ -10,7 +10,7 @@
 #include "dsd.h"

 //modified to accept variable payload size and len
-uint16_t ComputeCrcCCITT16d(const uint8_t buf[], uint8_t len)
+uint16_t ComputeCrcCCITT16d(const uint8_t * buf, uint32_t len)
 {
  uint32_t i;
  uint16_t CRC = 0x0000; /* Initialization value = 0x0000 */
--- a/src/dpmr_voice.c
+++ b/src/dpmr_voice.c
@@ -376,7 +376,7 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
    fprintf (stderr, "%s", KNRM);

    //check other as well before assigning
-    if(state->dPMRVoiceFS2Frame.CallingIDOk) sprintf (state->dpmr_target_id, "%s", CalledID);
+    if(state->dPMRVoiceFS2Frame.CalledIDOk) sprintf (state->dpmr_target_id, "%s", CalledID);

  }
  else
@@ -412,7 +412,7 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
  {
  fprintf (stderr, "%s", KRED);
  fprintf(stderr, " Src=(CRC ERR) Channel Code =(CRC ERR)");
-  fprintf (stderr, "%s", KNRM); 
+  fprintf (stderr, "%s", KNRM);
  }

  if (state->dPMRVoiceFS2Frame.Version[0] == 3)
@@ -439,7 +439,7 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)

    //reset scrambler key seed on frame 0
    if (state->dPMRVoiceFS2Frame.FrameNumbering[o] == 0) state->payload_miN = 0;
-    
+
    //depending on first or second TCH, set start and end variables appropriately
    if (o == 1)
    {
@@ -448,14 +448,14 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)

    }

-    //this is used so we can simply pass the voice here to the 
+    //this is used so we can simply pass the voice here to the
    //nxdn scrambler by telling mbe these are nxdn frames and to
    //apply the same descramble method to them if necessary
-    int realsynctype = state->synctype; 
+    int realsynctype = state->synctype;

    // fprintf (stderr, "\nCommunication Mode: %d\n", state->dPMRVoiceFS2Frame.CommunicationMode[o]);
    // fprintf (stderr, "Encryption Mode: %d\n", state->dPMRVoiceFS2Frame.Version[o]); //shows as 3 (manufacturer specific, 5.16) on the dPMR scrambler values received
-    // fprintf (stderr, "Superframe Number: %d", state->dPMRVoiceFS2Frame.FrameNumbering[o]); 
+    // fprintf (stderr, "Superframe Number: %d", state->dPMRVoiceFS2Frame.FrameNumbering[o]);

    if((state->dPMRVoiceFS2Frame.CommunicationMode[o] == 0) ||
       (state->dPMRVoiceFS2Frame.CommunicationMode[o] == 1) ||
@@ -469,14 +469,14 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
        state->nxdn_cipher_type = 0x01; //turn on nxdn scrambler cipher
        state->dmr_encL = 1; //flag on enc bit here so we can mute if no key provided
      }
-      
+
      //flag back off if key is provided
      if (state->R != 0) state->dmr_encL = 0;

      //print Current Frame Number if payload verbosity enabled
      if (opts->payload == 1)
        fprintf (stderr, "\n FN %d/4", state->dPMRVoiceFS2Frame.FrameNumbering[o]+1);
-      
+
      //There are 4 AMBE voice frames per TCH
      for(i = start; i < end; i++)
      {
@@ -485,14 +485,14 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
          playSynthesizedVoiceMS(opts, state);
        if (opts->floating_point == 1)
          playSynthesizedVoiceFM(opts, state);
-      } 
+      }

      //set the correct sync type again and flag off the cipher
      state->synctype = realsynctype;
      state->nxdn_cipher_type = 0;

-    } 
-  } 
+    }
+  }

  fprintf(stderr, "\n");

--- a/src/dsd_alias.c
+++ b/src/dsd_alias.c
@@ -0,0 +1,825 @@
+/*-------------------------------------------------------------------------------
+ * dsd_alias.c
+ * Talker Alias Handling for Various Protocols and Vendors
+ *
+ * LWVMOBILE
+ * 2025-02 DSD-FME Florida Man Edition
+ *-----------------------------------------------------------------------------*/
+
+#include "dsd.h"
+
+//Motorola P25 OTA Alias Decoding ripped/demystified from Ilya Smirnov's SDRTrunk Voodoo Code
+uint8_t moto_alias_lut[256] = {
+  0xD2, 0xF6, 0xD4, 0x2B, 0x63, 0x49, 0x94, 0x5E, 0xA7, 0x5C, 0x70, 0x69, 0xF7, 0x08, 0xB1, 0x7D,
+  0x38, 0xCF, 0xCC, 0xD8, 0x51, 0x8F, 0xD5, 0x93, 0x6A, 0xF3, 0xEF, 0x7E, 0xFB, 0x64, 0xF4, 0x35,
+  0x27, 0x07, 0x31, 0x14, 0x87, 0x98, 0x76, 0x34, 0xCA, 0x92, 0x33, 0x1B, 0x4F, 0x8C, 0x09, 0x40,
+  0x32, 0x36, 0x77, 0x12, 0xD3, 0xC3, 0x01, 0xAB, 0x72, 0x81, 0x95, 0xC9, 0xC0, 0xE9, 0x65, 0x52,
+  0x24, 0x30, 0x1C, 0xDB, 0x88, 0xE8, 0x97, 0x9D, 0x58, 0x26, 0x04, 0x39, 0xAC, 0x2A, 0x9E, 0xAA,
+  0x25, 0xD7, 0xCE, 0xEB, 0x96, 0xF5, 0x0E, 0x8D, 0xDC, 0xA9, 0x2F, 0xDD, 0x1F, 0xEA, 0x91, 0xB7,
+  0xD6, 0x89, 0x8B, 0xD1, 0xB0, 0x99, 0x13, 0x7A, 0xE7, 0x9A, 0xB5, 0x86, 0xFF, 0x46, 0x85, 0xB2,
+  0x73, 0xDA, 0xBF, 0xD0, 0x71, 0xCB, 0x4D, 0x80, 0x15, 0x67, 0x16, 0x1A, 0x20, 0x8E, 0x45, 0x3E,
+  0xF2, 0x2E, 0x66, 0x90, 0x74, 0x8A, 0x6F, 0x78, 0xBB, 0x53, 0x03, 0x11, 0x68, 0xCD, 0x44, 0x17,
+  0x28, 0x5F, 0x1E, 0x84, 0x75, 0x79, 0x6E, 0x9B, 0x2C, 0xBE, 0x62, 0x2D, 0xF1, 0x7C, 0xB8, 0x83,
+  0xD9, 0x4E, 0x6D, 0x02, 0x61, 0x3D, 0xA8, 0x06, 0xB9, 0xF8, 0x9C, 0x37, 0x3A, 0x23, 0xC1, 0x50,
+  0xED, 0x9F, 0xAF, 0x3B, 0xBD, 0x82, 0xBA, 0xA0, 0xDF, 0xC2, 0x47, 0x22, 0xF0, 0xEE, 0xA1, 0xFE,
+  0xA2, 0x10, 0x5B, 0x48, 0x57, 0xA3, 0x05, 0x60, 0x7B, 0x0D, 0xF9, 0x6C, 0xB3, 0x56, 0x4C, 0xBC,
+  0x29, 0xA4, 0x0F, 0xEC, 0xB6, 0xA5, 0xA6, 0x3C, 0x7F, 0x6B, 0xB4, 0x21, 0xAD, 0xAE, 0xC4, 0xC8,
+  0xC5, 0x5D, 0xDE, 0xE0, 0x1D, 0x19, 0x4B, 0xC6, 0x0C, 0x3F, 0x5A, 0xC7, 0xE1, 0x59, 0x55, 0x54,
+  0x4A, 0x43, 0x42, 0xE2, 0xE3, 0xFA, 0x00, 0xE4, 0xE5, 0x18, 0x41, 0x0B, 0x0A, 0xE6, 0xFC, 0xFD
+};
+
+void apx_embedded_alias_test_phase1 (dsd_opts * opts, dsd_state * state)
+{
+
+  uint64_t temp_a = 0x15902D2806010005; uint64_t temp_b = 0xDE; //72 bits, so break into segments
+  uint8_t lcw[72]; memset (lcw, 0, sizeof(lcw));
+  for (uint64_t i = 0; i < 64; i++)
+    lcw[i] = (temp_a >> (63-i)) & 1;
+  for (uint64_t i = 0; i < 8; i++)
+    lcw[i+64] = (temp_b >> (7-i)) & 1;
+  p25_lcw(opts, state, lcw, 0);
+
+  temp_a = 0x1790010BEE0740F0; temp_b = 0x4E;
+  memset (lcw, 0, sizeof(lcw));
+  for (uint64_t i = 0; i < 64; i++)
+    lcw[i] = (temp_a >> (63-i)) & 1;
+  for (uint64_t i = 0; i < 8; i++)
+    lcw[i+64] = (temp_b >> (7-i)) & 1;
+  p25_lcw(opts, state, lcw, 0);
+
+  temp_a = 0x17900200DD2D2168; temp_b = 0x1A;
+  memset (lcw, 0, sizeof(lcw));
+  for (uint64_t i = 0; i < 64; i++)
+    lcw[i] = (temp_a >> (63-i)) & 1;
+  for (uint64_t i = 0; i < 8; i++)
+    lcw[i+64] = (temp_b >> (7-i)) & 1;
+  p25_lcw(opts, state, lcw, 0);
+
+  temp_a = 0x17900301B52FFBFB; temp_b = 0xFE;
+  memset (lcw, 0, sizeof(lcw));
+  for (uint64_t i = 0; i < 64; i++)
+    lcw[i] = (temp_a >> (63-i)) & 1;
+  for (uint64_t i = 0; i < 8; i++)
+    lcw[i+64] = (temp_b >> (7-i)) & 1;
+  p25_lcw(opts, state, lcw, 0);
+
+  temp_a = 0x1790040E53FE86BE; temp_b = 0xF7;
+  memset (lcw, 0, sizeof(lcw));
+  for (uint64_t i = 0; i < 64; i++)
+    lcw[i] = (temp_a >> (63-i)) & 1;
+  for (uint64_t i = 0; i < 8; i++)
+    lcw[i+64] = (temp_b >> (7-i)) & 1;
+  p25_lcw(opts, state, lcw, 0);
+
+  temp_a = 0x17900508FD5AB910; temp_b = 0xB2;
+  memset (lcw, 0, sizeof(lcw));
+  for (uint64_t i = 0; i < 64; i++)
+    lcw[i] = (temp_a >> (63-i)) & 1;
+  for (uint64_t i = 0; i < 8; i++)
+    lcw[i+64] = (temp_b >> (7-i)) & 1;
+  p25_lcw(opts, state, lcw, 0);
+
+  temp_a = 0x1790060376F9D800; temp_b = 0x00;
+  memset (lcw, 0, sizeof(lcw));
+  for (uint64_t i = 0; i < 64; i++)
+    lcw[i] = (temp_a >> (63-i)) & 1;
+  for (uint64_t i = 0; i < 8; i++)
+    lcw[i+64] = (temp_b >> (7-i)) & 1;
+  p25_lcw(opts, state, lcw, 0);
+
+  //Harris Phase 1 GPS
+  state->lastsrc = 1000;
+  temp_a = 0x2AA41D4C24262328; temp_b = 0xAF;
+  memset (lcw, 0, sizeof(lcw));
+  for (uint64_t i = 0; i < 64; i++)
+    lcw[i] = (temp_a >> (63-i)) & 1;
+  for (uint64_t i = 0; i < 8; i++)
+    lcw[i+64] = (temp_b >> (7-i)) & 1;
+  p25_lcw(opts, state, lcw, 0);
+
+  temp_a = 0x2BA44E0DB2660108; temp_b = 0x14;
+  memset (lcw, 0, sizeof(lcw));
+  for (uint64_t i = 0; i < 64; i++)
+    lcw[i] = (temp_a >> (63-i)) & 1;
+  for (uint64_t i = 0; i < 8; i++)
+    lcw[i+64] = (temp_b >> (7-i)) & 1;
+  p25_lcw(opts, state, lcw, 0);
+  state->lastsrc = 0;
+
+}
+
+void apx_embedded_alias_header_phase1 (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t * lc_bits)
+{
+
+  UNUSED(opts);
+  uint8_t ta_len = (uint8_t)ConvertBitIntoBytes(&lc_bits[32], 8); //len in blocks of associated talker alias
+  uint8_t sn = (uint8_t)ConvertBitIntoBytes(&lc_bits[56], 4);
+  fprintf (stderr, " SN: %X;", sn);
+  fprintf (stderr, " BN: 0/%d;", ta_len);
+
+  //use dmr_pdu_sf for storage, store entire header (will be used to verify complete reception of full alias)
+  memset (state->dmr_pdu_sf[slot], 0, sizeof (state->dmr_pdu_sf[slot])); //reset storage for header and blocks
+  memcpy (state->dmr_pdu_sf[slot], lc_bits, 72*sizeof(uint8_t));
+
+}
+
+void apx_embedded_alias_blocks_phase1 (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t * lc_bits)
+{
+
+  UNUSED(opts);
+  uint8_t bn = (uint8_t)ConvertBitIntoBytes(&lc_bits[16], 8); //current block number
+  uint8_t sn = (uint8_t)ConvertBitIntoBytes(&lc_bits[24], 4); //is a static value on all block sequences
+  uint8_t ta_len = (uint8_t)ConvertBitIntoBytes(&state->dmr_pdu_sf[slot][32], 8); //len in blocks pulled from stored header
+  uint16_t header = (uint16_t)ConvertBitIntoBytes(&state->dmr_pdu_sf[slot][0], 16); //header check, should be 0x1590
+
+  if (ta_len == 0 || header != 0x1590) //checkdown, make sure we have an up to date header for this with a good len value
+  {
+    fprintf (stderr, " Missing Header");
+    fprintf (stderr, " BN: %d/??;", bn);
+    fprintf (stderr, " SN: %X;", sn);
+    fprintf (stderr, " Partial: ");
+    for (uint8_t i = 7; i < 18; i++)
+      fprintf (stderr, "%0X", (uint8_t)ConvertBitIntoBytes(&lc_bits[0+(i*4)], 4));
+
+    //clear out now stale storage
+    memset (state->dmr_pdu_sf[slot], 0, sizeof (state->dmr_pdu_sf[slot]));
+  }
+
+  else //good len and header stored
+  {
+
+    //sanity check, bn cannot equal zero (this shouldn't happen, but bad decode could occur)
+    if (bn == 0) bn = 1;
+
+    fprintf (stderr, " SN: %X;", sn);
+    fprintf (stderr, " BN: %d/%d;", bn, ta_len);
+
+    //use dmr_pdu_sf for storage, store data relevant portion at ptr of (bn-1) * 44 + 72 offset for header
+    memcpy(state->dmr_pdu_sf[slot]+(((bn-1)*44)+72), lc_bits+28, 44*sizeof(uint8_t));
+
+    if (ta_len == bn) //this is the last block, proceed to decoding
+    {
+
+      //Calculate variable len bits determined by non-zero octets
+      int16_t num_bits = 56; //starting value is the static bit count on the fqsuid
+
+      // //evaluate the storage and determine how many octets/bits are present at this point (fall back to this if needed)
+      // for (int16_t i = 0; i < 368; i++) //(3072-128)/8
+      // {
+      //   uint8_t byte = (uint8_t)ConvertBitIntoBytes(&state->dmr_pdu_sf[slot][72+56+(i*8)], 8);
+      //   if (byte == 0)
+      //     break;
+      //   else
+      //     num_bits += 8;
+      // }
+
+      //evaluate the storage and determine how many octets/bits are present at this point (expanded to two octets each, CRC with a 00xx pattern failed this)
+      for (int16_t i = 0; i < 184; i++) //(3072-128)/16
+      {
+        uint16_t bytes = (uint16_t)ConvertBitIntoBytes(&state->dmr_pdu_sf[slot][72+56+(i*16)], 16);
+        if (bytes == 0)
+          break;
+        else
+          num_bits += 16;
+      }
+
+      //pass to alias decoder
+      apx_embedded_alias_decode (opts, state, slot, num_bits, state->dmr_pdu_sf[slot]);
+
+      //clear out now stale storage
+      memset (state->dmr_pdu_sf[slot], 0, sizeof(state->dmr_pdu_sf[slot]));
+
+    }
+  }
+}
+
+void apx_embedded_alias_header_phase2 (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t * lc_bits)
+{
+
+  UNUSED(opts);
+  uint8_t ta_len = (uint8_t)ConvertBitIntoBytes(&lc_bits[40], 8);
+  uint8_t sn = (uint8_t)ConvertBitIntoBytes(&lc_bits[64], 4);
+  uint8_t bn = (uint8_t)ConvertBitIntoBytes(&lc_bits[56], 8);
+  fprintf (stderr, " SN: %X;", sn); //NOTE: vPDU header is also a partial block, and has a block num and SN value in it
+  fprintf (stderr, " BN: %d/%d;", bn, ta_len);
+
+  //bit array to rearrange input lc_bits from phase 2 input to match the phase 1 header and block handling
+  uint8_t bits[136]; memset(bits, 0, sizeof(bits));
+  memcpy (bits, lc_bits, 2*8*sizeof(uint8_t));         //header 0x9190
+  memcpy (bits+16, lc_bits+24, 4*8*sizeof(uint8_t)); //BN, SN, etc
+  memcpy (bits+56, lc_bits+56, 10*8*sizeof(uint8_t)); //adding 8 bits of extra padding here
+
+  int16_t alias_st = 136; //start of the encoded alias (the copied size of this header, basically)
+
+  //debug, dump header arranged at this end
+  // fprintf (stderr, " Header: ");
+  // for (int16_t i = 0; i < alias_st/8; i++) //double check and adjust
+  //   fprintf (stderr, "%02X", (uint8_t)ConvertBitIntoBytes(&bits[0+(i*8)], 8));
+
+  //use dmr_pdu_sf for storage, store entire header (will be used to verify complete reception of full alias)
+  memset (state->dmr_pdu_sf[slot], 0, sizeof (state->dmr_pdu_sf[slot])); //reset storage for header and blocks
+  memcpy (state->dmr_pdu_sf[slot], bits, alias_st*sizeof(uint8_t)); //this header block has 128 bits of relevant data (through the fqsuid)
+
+}
+
+void apx_embedded_alias_blocks_phase2 (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t * lc_bits)
+{
+
+  UNUSED(opts);
+  int16_t rel_bits = 100;  //number of relevant bits in each block
+  int16_t rel_st   = 36;   //start of relevant bits in this block
+  int16_t alias_st = 136;  //start of the encoded alias
+  uint8_t bn = (uint8_t)ConvertBitIntoBytes(&lc_bits[24], 8); //current block number
+  uint8_t sn = (uint8_t)ConvertBitIntoBytes(&lc_bits[32], 4); //is a static value on all block sequences
+  uint8_t ta_len = (uint8_t)ConvertBitIntoBytes(&state->dmr_pdu_sf[slot][32], 8); //len in blocks pulled from stored header
+  uint16_t header = (uint16_t)ConvertBitIntoBytes(&state->dmr_pdu_sf[slot][0], 16); //header check, should be 0x9190
+
+  if (ta_len == 0 || header != 0x9190)
+  {
+    fprintf (stderr, " Missing Header");
+    fprintf (stderr, " BN: %d/??;", bn);
+    fprintf (stderr, " SN: %X;", sn);
+    fprintf (stderr, " Partial: ");
+    for (uint8_t i = 9; i < 32; i++) //double check and adjust
+      fprintf (stderr, "%0X", (uint8_t)ConvertBitIntoBytes(&lc_bits[0+(i*4)], 4));
+
+    //clear out now stale storage
+    memset (state->dmr_pdu_sf[slot], 0, sizeof(state->dmr_pdu_sf[slot]));
+  }
+
+  else //good len and header stored
+  {
+
+    //sanity check, bn cannot equal zero (this shouldn't happen, but bad decode could occur)
+    if (bn == 0) bn = 1;
+
+    fprintf (stderr, " SN: %X;", sn);
+    fprintf (stderr, " BN: %d/%d;", bn, ta_len);
+
+    //use dmr_pdu_sf for storage, store data relevant portion at ptr calculated below
+    memcpy(state->dmr_pdu_sf[slot]+(alias_st+((bn-1)*rel_bits)), lc_bits+rel_st, rel_bits*sizeof(uint8_t)); //Fix this value when samples arrive
+
+    //debug, dump accumulated data at this end
+    // fprintf (stderr, " Accumulated: ");
+    // for (int16_t i = 0; i < (alias_st+(rel_bits*bn))/8; i++) //double check and adjust
+    //   fprintf (stderr, "%02X", (uint8_t)ConvertBitIntoBytes(&state->dmr_pdu_sf[slot][0+(i*8)], 8));
+
+    if (ta_len == bn) //this is the last block, proceed to decoding
+    {
+
+      //Calculate variable len bits determined by non-zero octets
+      int16_t num_bits = 56; //starting value is the static bit count on the fqsuid
+
+      // //evaluate the storage and determine how many octets/bits are present at this point (fall back to this if needed)
+      // for (int16_t i = 0; i < 368; i++) //(3072-128)/8
+      // {
+      //   uint8_t byte = (uint8_t)ConvertBitIntoBytes(&state->dmr_pdu_sf[slot][72+56+(i*8)], 8);
+      //   if (byte == 0)
+      //     break;
+      //   else
+      //     num_bits += 8;
+      // }
+
+      //evaluate the storage and determine how many octets/bits are present at this point (expanded to two octets each, CRC with a 00xx pattern failed this)
+      for (int16_t i = 0; i < 184; i++) //(3072-128)/16
+      {
+        uint16_t bytes = (uint16_t)ConvertBitIntoBytes(&state->dmr_pdu_sf[slot][72+56+(i*16)], 16);
+        if (bytes == 0)
+          break;
+        else
+          num_bits += 16;
+      }
+
+      //pass to alias decoder
+      apx_embedded_alias_decode (opts, state, slot, num_bits, state->dmr_pdu_sf[slot]);
+
+      //clear out now stale storage
+      memset (state->dmr_pdu_sf[slot], 0, sizeof (state->dmr_pdu_sf[slot]));
+
+    }
+  }
+}
+
+void apx_embedded_alias_decode (dsd_opts * opts, dsd_state * state, uint8_t slot, int16_t num_bits, uint8_t * input)
+{
+
+  UNUSED(opts);
+  UNUSED(state);
+  UNUSED(slot);
+
+  //debug, dump completed data set
+  // fprintf (stderr, "\n Full: ");
+  // for (int16_t i = 0; i < (72+num_bits)/4; i++)
+  //   fprintf (stderr, "%X", (uint8_t)ConvertBitIntoBytes(&input[0+(i*4)], 4));
+
+  //extract CRC
+  uint16_t crc_ext = (uint16_t)ConvertBitIntoBytes(&input[(72+num_bits-16)], 16);
+
+  //compute CRC
+  uint16_t crc_cmp = ComputeCrcCCITT16d(&input[72], num_bits-16);
+
+  //print comparison
+  // fprintf (stderr, " CRC EXT: %04X CMP: %04X;", crc_ext, crc_cmp);
+  if (crc_ext != crc_cmp)
+    fprintf (stderr, " Alias CRC Error;");
+  // else fprintf (stderr, " Alias Okay;");
+
+  //start decoding the alias
+  if (crc_ext == crc_cmp)
+  {
+
+    //extract fully qualified SUID
+    uint32_t wacn = (uint32_t)ConvertBitIntoBytes(&input[72], 20);
+    uint32_t sys  = (uint32_t)ConvertBitIntoBytes(&input[92], 12);
+    uint32_t rid  = (uint32_t)ConvertBitIntoBytes(&input[104], 24);
+
+    //print fully qualified SUID
+    fprintf (stderr, "\n FQ-SUID: %05X.%03X.%06X (%d);", wacn, sys, rid, rid);
+
+    //WIP: Working, needs more samples to verify various num_bits values
+    uint16_t ptr = 128;   //starting point of encoded alias
+    uint8_t encoded[200]; memset(encoded, 0, sizeof(encoded));
+    uint8_t decoded[200]; memset(decoded, 0, sizeof(decoded));
+    uint16_t num_bytes = (num_bits / 8) - 9; //subtract 2 CRC and 7 FQSUID
+
+    //sanity check
+    if (num_bytes <= 0) num_bytes = 1;
+
+    for (int16_t i = 0; i < num_bytes; i++)
+    {
+      encoded[i] = (uint8_t)ConvertBitIntoBytes(&input[ptr], 8);
+      ptr += 8;
+    }
+
+    uint16_t accumulator = num_bytes;
+
+    //Ilya's Voodoo Code
+    for (uint16_t i = 0; i < num_bytes; i++)
+    {
+      // Multiplication step 1
+      uint16_t accum_mult = accumulator * 293 + 0x72E9;
+
+      // Lookup table step
+      uint8_t lut = moto_alias_lut[encoded[i]];
+      uint8_t mult1 = lut - (accum_mult >> 8);
+
+      // Incrementing step
+      uint8_t mult2 = 1;
+      uint8_t shortstop = accum_mult | 0x1;
+      uint8_t increment = shortstop << 1;
+
+      //clang warning -- warning: result of comparison of constant -1 with expression of type 'uint8_t' (aka 'unsigned char') is always true [-Wtautological-constant-out-of-range-compare]
+      // while(mult2 != -1 && shortstop != 1) //clang warning can't be -1 if uint8_t (set to 255 instead?)
+      while(shortstop != 1) //this one tests out okay, so may use it instead
+      {
+        shortstop += increment;
+        mult2 += 2;
+      }
+
+      // Multiplication step 2
+      decoded[i] = mult1 * mult2;
+
+      // Update the accumulator
+      accumulator += encoded[i] + 1;
+
+    }
+
+    // //debug, dump just the encoded alias portion
+    // fprintf (stderr, "\n Encoded: ");
+    // for (int16_t i = 0; i < num_bytes; i++)
+    //   fprintf (stderr, "%02X", encoded[i]);
+
+    // //debug, dump the decoded payload as hex octets
+    // fprintf (stderr, "\n Decoded: ");
+    // for (int16_t i = 0; i < num_bytes; i++)
+    //   fprintf (stderr, "%02X", decoded[i]);
+
+    //dump the decoded payload as long chars
+    // fprintf (stderr, "\n");
+    fprintf (stderr, " Alias: ");
+    for (int16_t i = 0; i < num_bytes/2; i++)
+      fprintf (stderr, "%lc", ((decoded[(i*2)+0])<<8) | ((decoded[(i*2)+1])<<0) );
+
+    apx_embedded_alias_dump (opts, state, slot, num_bytes, input, decoded);
+
+  }
+
+}
+
+void apx_embedded_alias_dump (dsd_opts * opts, dsd_state * state, uint8_t slot, uint16_t num_bytes, uint8_t * input, uint8_t * decoded)
+{
+
+  char str[50]; memset(str, 0, sizeof(str));
+  char fqs[50]; memset(fqs, 0, sizeof(fqs));
+
+  //check num_bytes, if greter than 100, then set to 100
+  if (num_bytes >= 98) num_bytes = 98;
+
+  for (int16_t i = 0; i < num_bytes/2; i++)
+  {
+    if (decoded[(i*2)+1] == 0x2C) //remove a comma if it exists, change it to a 0x2E dot
+      str[i] = 0x2E;
+    else if (decoded[(i*2)+1] > 0x1F && decoded[(i*2)+1] < 0x7F) //may not need or use this restriction
+      str[i] = decoded[(i*2)+1];
+    else str[i] = 0x20; //space
+  }
+
+  //flag to indicate this already exists in import or group struct
+  uint8_t wr = 0;
+
+  //fully qualified SUID
+  uint32_t wacn = (uint32_t)ConvertBitIntoBytes(&input[72], 20);
+  uint32_t sys  = (uint32_t)ConvertBitIntoBytes(&input[92], 12);
+  uint32_t rid  = (uint32_t)ConvertBitIntoBytes(&input[104], 24);
+
+  sprintf (fqs, " FQ-SUID: %05X:%03X.%06X (%d);", wacn, sys, rid, rid);
+  if (rid != 0 && state->event_history_s[slot].Event_History_Items[0].source_id == rid)
+  {
+    sprintf (state->event_history_s[slot].Event_History_Items[0].alias, "%s; ", str);
+    strcat (state->event_history_s[slot].Event_History_Items[0].alias, fqs);
+  }
+
+  for (int16_t i = 0; i < state->group_tally; i++)
+  {
+    if (state->group_array[i].groupNumber == rid)
+    {
+      wr = 1; //already in there, so no need to assign it
+      break;
+    }
+  }
+
+  if (wr == 0) //not already in there, so save it there now
+  {
+    state->group_array[state->group_tally].groupNumber = rid;
+    sprintf (state->group_array[state->group_tally].groupMode, "%s", "D");
+    sprintf (state->group_array[state->group_tally].groupName, "%s", str);
+    state->group_tally++;
+
+    //if we have an opened group file, let's write what info we found into it
+    if (opts->group_in_file[0] != 0) //file is available
+    {
+      FILE * pFile; //file pointer
+      //open file by name that is supplied in the ncurses terminal, or cli
+      pFile = fopen (opts->group_in_file, "a");
+      fprintf (pFile, "%d,D,", rid); //may want to not use this one
+      fprintf (pFile, "%s", str);
+      fprintf (pFile, ",FQS:%05X.%03X.%06X(%d),Moto\n", wacn, sys, rid, rid);
+      fclose (pFile);
+    }
+
+  }
+
+}
+
+//end Motorola P25 OTA Alias Decoding
+
+//TODO: Migrate Other OTA Alias functions here
+
+void l3h_embedded_alias_blocks_phase1 (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t * lc_bits)
+{
+
+  uint8_t op  = (uint8_t)ConvertBitIntoBytes(&lc_bits[0], 8);
+  uint8_t ptr = op-0x32;
+  uint8_t bytes[7]; memset(bytes, 0, sizeof(bytes));
+  for (uint8_t i = 0; i < 7; i++)
+    bytes[i] = (uint8_t)ConvertBitIntoBytes(&lc_bits[16+(i*8)], 8);
+
+  //use +4 offset to match the MAC vPDU since that was already worked out long ago
+  memcpy(state->dmr_pdu_sf[slot]+4+(ptr*7), bytes, sizeof(bytes));
+
+  //to be tested
+  if (ptr == 4) //is there always 4 blocks, or is it a variable amount?
+    l3h_embedded_alias_decode(opts, state, slot, 4+28, state->dmr_pdu_sf[slot]);
+}
+
+void l3h_embedded_alias_decode (dsd_opts * opts, dsd_state * state, uint8_t slot, int16_t len, uint8_t * input)
+{
+
+  //storage info for storing to groupName, if not available
+  char str[40];   memset (str, 0, sizeof(str));
+  char ttemp[40]; memset (ttemp, 0, sizeof(ttemp));
+  uint8_t wr = 0;
+  uint32_t tsrc = 0, ttg = 0;
+  if (slot == 0 && state->lastsrc != 0) tsrc = state->lastsrc;
+  if (slot == 1 && state->lastsrcR != 0) tsrc = state->lastsrcR;
+  if (slot == 0 && state->lasttg != 0) ttg = state->lasttg;
+  if (slot == 1 && state->lasttgR != 0) ttg = state->lasttgR;
+
+  int8_t ptr = 0;
+  if (tsrc != 0)
+    fprintf (stderr, " TG: %d; SRC: %d; Talker Alias: ", ttg, tsrc);
+  else fprintf (stderr, " TG: UNK; SRC: UNK; Talker Alias: ");
+  for (int8_t i = 4; i <= len; i++)
+  {
+    if ( (input[i] > 0x19) && (input[i] < 0x7F) )
+      fprintf (stderr, "%c", (char)input[i]);
+    else fprintf (stderr, " ");
+
+    if (input[i] == 0x2C) //remove a comma if it exists, change it to a 0x2E dot
+      ttemp[ptr] = 0x2E;
+    else if ( (input[i] > 0x19) && (input[i] < 0x7F) )
+      ttemp[ptr] = input[i];
+    else if (input[i] != 0)
+      ttemp[ptr] = 0x20; //space
+
+    ptr++;
+  }
+
+  //assign completed talker to a more useful string instead
+  snprintf (str, ptr+1, "%s", ttemp);
+
+  if (state->event_history_s[slot].Event_History_Items[0].source_id == tsrc && tsrc != 0)
+    sprintf (state->event_history_s[slot].Event_History_Items[0].alias, "%s", str);
+
+  //The Duke Energy system may relay two src values, may be a good idea to pick one and stick with it
+  if (tsrc != 0)
+  {
+    for (int16_t i = 0; i < state->group_tally; i++)
+    {
+      if (state->group_array[i].groupNumber == tsrc)
+      {
+        wr = 1; //already in there, so no need to assign it
+        break;
+      }
+    }
+
+    if (wr == 0) //not already in there, so save it there now
+    {
+      state->group_array[state->group_tally].groupNumber = tsrc;
+      sprintf (state->group_array[state->group_tally].groupMode, "%s", "D");
+      sprintf (state->group_array[state->group_tally].groupName, "%s", str);
+      state->group_tally++;
+
+      //if we have an opened group file, let's write what info we found into it
+      if (opts->group_in_file[0] != 0) //file is available
+      {
+        FILE * pFile; //file pointer
+        //open file by name that is supplied in the ncurses terminal, or cli
+        pFile = fopen (opts->group_in_file, "a");
+        fprintf (pFile, "%d,D,", tsrc);
+        fprintf (pFile, "%s", str);
+        fprintf (pFile, ",TG:%d,SYS:%03llX,RFSS:%lld,SITE:%lld,Harris\n", ttg, state->p2_sysid, state->p2_rfssid, state->p2_siteid);
+        fclose (pFile);
+      }
+
+    }
+  }
+
+  //debug
+  // fprintf (stderr, "\n WR: %d TG: %d SRC: %d Res: %d Len: %d STR: %s", wr, ttg, tsrc, res, len, str);
+
+  //reset storage
+  memset (state->dmr_pdu_sf[slot], 0, sizeof (state->dmr_pdu_sf[slot]));
+
+}
+
+void tait_iso7_embedded_alias_decode (dsd_opts * opts, dsd_state * state, uint8_t slot, int16_t len, uint8_t * input)
+{
+
+  UNUSED(slot);
+  uint8_t alias[24]; memset(alias, 0, sizeof(alias));
+  for (uint8_t i = 0; i < len; i++)
+  {
+    alias[i] = (uint8_t)ConvertBitIntoBytes(&input[16+(i*7)], 7);
+    fprintf (stderr, "%c", alias[i]);
+    if (alias[i] == 0x2C) //change a comma to a dot
+      alias[i] = 0x2E;
+    else if (alias[i] < 0x20) //change any garble / control chars to a space
+      alias[i] = 0x20;
+  }
+
+  //flag to indicate this already exists in import or group struct
+  uint8_t wr = 0;
+  uint32_t rid  = state->lastsrc;
+  uint16_t nac = state->nac;
+
+  if (state->event_history_s[slot].Event_History_Items[0].source_id == rid)
+    sprintf (state->event_history_s[slot].Event_History_Items[0].alias, "%s", alias);
+
+  if (rid != 0)
+  {
+    for (int16_t i = 0; i < state->group_tally; i++)
+    {
+      if (state->group_array[i].groupNumber == rid)
+      {
+        wr = 1; //already in there, so no need to assign it
+        break;
+      }
+    }
+
+    if (wr == 0) //not already in there, so save it there now
+    {
+      state->group_array[state->group_tally].groupNumber = rid;
+      sprintf (state->group_array[state->group_tally].groupMode, "%s", "D");
+      sprintf (state->group_array[state->group_tally].groupName, "%s", alias);
+      state->group_tally++;
+
+      //if we have an opened group file, let's write what info we found into it
+      if (opts->group_in_file[0] != 0) //file is available
+      {
+        FILE * pFile; //file pointer
+        //open file by name that is supplied in the ncurses terminal, or cli
+        pFile = fopen (opts->group_in_file, "a");
+        fprintf (pFile, "%d,D,", rid); //may want to not use this one
+        fprintf (pFile, "%s,", alias);
+        fprintf (pFile, "%03X,", nac); //if we find this on a trunking system, may want to add the site and rfss id
+        fprintf (pFile, "%s", ",Tait\n");
+        fclose (pFile);
+      }
+
+    }
+
+  }
+}
+
+void dmr_talker_alias_lc_header (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t * lc_bits)
+{
+  uint8_t format = (uint8_t)ConvertBitIntoBytes(&lc_bits[16], 2);
+  uint8_t block_len = (uint8_t)ConvertBitIntoBytes(&lc_bits[18], 5);
+  uint8_t char_size = 0;
+
+  if (format == 0) char_size = 7;
+  else if (format == 1 || format == 2) char_size = 8;
+  else char_size = 16;
+
+  state->dmr_alias_format[slot] = format;
+  state->dmr_alias_block_len[slot] = block_len; //data len, see below
+  state->dmr_alias_char_size[slot] = char_size;
+
+  //load into dmr_pdu_sf as bit wise values for this since iso7 has 49 bits in this header, otherwise, load with 48?
+  if (char_size == 7)
+    memcpy(state->dmr_pdu_sf[slot], lc_bits+23, 49*sizeof(uint8_t));
+  else if (char_size == 8) 
+    memcpy(state->dmr_pdu_sf[slot], lc_bits+24, 48*sizeof(uint8_t));
+  else if (char_size == 16)
+    memcpy(state->dmr_pdu_sf[slot], lc_bits+24, 48*sizeof(uint8_t));
+
+  //TEST: The Block Len (Data Lan) value is, according to my interpretation, the number of encoded 
+  //character units in the alias, test to verify, but fall back to the ptr index if necessary
+  //this is referenced in  5.4.3 ETSI TS 102 361-2 V2.5.1 (2023-05) 7.2.19 Talker Alias Data Length
+
+  fprintf (stderr, " Slot %d - Talker Alias LC Header; Format %d; Char Len: %d; Char Size: %d;", slot, format, block_len, char_size);
+
+  //Decode the header's alias portion
+  fprintf (stderr, "\n");
+  dmr_talker_alias_lc_decode(opts, state, slot, 0, char_size, block_len);
+}
+
+void dmr_talker_alias_lc_blocks (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t block_num, uint8_t * lc_bits)
+{
+  UNUSED(opts); //delete if we don't use this, but may want it if we dump alias to a file later on
+  uint8_t block_len = state->dmr_alias_block_len[slot];
+  uint8_t char_size = state->dmr_alias_char_size[slot];
+  uint16_t ptr = 0;
+  uint16_t end = block_len;
+
+  //Note: The Joann sample only carries block 5, and no header on block 4
+  //another radio on that ham setup also has a broken alias similar, but
+  //the other talkers have the 04 and the sample has a good decode otherwise
+  //debug broken aliasing on ham radio
+
+  // if (char_size == 0) //Enable this is you need to check alias even with missing header (set 7, 8, or 16)
+  //   char_size = 8;
+
+  /*
+    22:54:51 Sync: +DMR   slot1  [SLOT2] | Color Code=01 | VC6 
+    Slot 1 - Talker Alias Block Num: 1; Valid Block; Talker Alias:       Joann  
+    DMR PDU Payload [05][00][4A][6F][61][6E][6E][00][FF]
+  */
+
+  //set the pointer to the current index of the dmr_pdu_sf
+  if (char_size == 16)
+    ptr = 48 + (block_num * 56);
+  else if (char_size == 8)
+    ptr = 48 + (block_num * 56);
+  else if (char_size == 7)
+    ptr = 49 + (block_num * 56);
+
+  if (char_size == 0) //unset, no header received
+    fprintf (stderr, " Slot %d - Talker Alias Block Num: %d; Invalid Header;", slot, block_num+1);
+
+  else if (block_num > 3) //invalid block (data error)
+    fprintf (stderr, " Slot %d - Talker Alias Block Num: %d; Invalid Block;", slot, block_num+1);
+
+  else //valid header present, continue
+  {
+    if (char_size == 7)
+    {
+      memcpy(state->dmr_pdu_sf[slot]+ptr, lc_bits+16, 56*sizeof(uint8_t));
+      ptr += 56;
+      if (block_len == 0)
+        end = ptr / 7;
+      else end = block_len;
+    }
+    else if (char_size == 8)
+    {
+      memcpy(state->dmr_pdu_sf[slot]+ptr, lc_bits+16, 56*sizeof(uint8_t));
+      ptr += 56;
+      if (block_len == 0)
+        end = ptr / 8;
+      else end = block_len;
+    }
+    else if (char_size == 16)
+    {
+      memcpy(state->dmr_pdu_sf[slot]+ptr, lc_bits+16, 56*sizeof(uint8_t));
+      ptr += 56;
+      if (block_len == 0)
+        end = ptr / 16;
+      else end = block_len;
+    }
+
+    dmr_talker_alias_lc_decode (opts, state, slot, block_num+1, char_size, end);
+  }
+}
+
+//Decode partial or completed alias
+void dmr_talker_alias_lc_decode (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t block_num, uint8_t char_size, uint16_t end)
+{
+  UNUSED(opts);
+  uint16_t i = 0;
+  fprintf (stderr, " Slot %d - Talker Alias Block Num: %d; Valid Block;", slot, block_num+1);
+  fprintf (stderr, " Talker Alias: ");
+
+  char alias_string[500]; memset (alias_string, 0, sizeof(alias_string));
+  sprintf (alias_string, "%s", "");
+
+  if (char_size == 7)
+  {
+    for (i = 0; i < end; i++)
+    {
+      uint8_t character = (uint8_t)ConvertBitIntoBytes(&state->dmr_pdu_sf[slot][(i*7)], 7);
+      char ch[2]; ch[0] = character; ch[1] = 0;
+      if (character >= 0x20 && character <= 0x7E) //Standard ASCII Set
+      {
+        fprintf (stderr, "%c", character);
+        strcat (alias_string, ch);
+      }
+      // else if (character == 0)
+      // {
+      //   strcat (alias_string, " ");
+      //   fprintf (stderr, " ");
+      //   break;
+      // }
+      else
+      {
+        strcat (alias_string, " ");
+        fprintf (stderr, " ");
+      }
+    }
+  }
+  else if (char_size == 8)
+  {
+    for (i = 0; i < end; i++)
+    {
+      uint8_t character = (uint8_t)ConvertBitIntoBytes(&state->dmr_pdu_sf[slot][(i*8)], 8);
+      char ch[2]; ch[0] = character; ch[1] = 0;
+      // if (character >= 0x20 && character <= 0x7E) //Standard ASCII Set
+      if (character >= 0x20 && character != 0x7F) //allow some extended UTF diacritical characters as well
+      {
+        fprintf (stderr, "%c", character);
+        strcat (alias_string, ch);
+      }
+      // else if (character == 0)
+      // {
+      //   strcat (alias_string, " ");
+      //   fprintf (stderr, " ");
+      //   break;
+      // }
+      else
+      {
+        strcat (alias_string, " ");
+        fprintf (stderr, " ");
+      }
+    }
+  }
+  else if (char_size == 16)
+  {
+    int ptr = 0;
+    setlocale(LC_ALL, ""); //needed when encoded alias contains Chinese (or probably any non-roman charset that isn't default on users terminal)
+    for (i = 0; i < end; i++)
+    {
+      uint16_t character = (uint16_t)ConvertBitIntoBytes(&state->dmr_pdu_sf[slot][(i*16)], 16);
+      
+      if (character >= 0x20 && character != 0x7F)
+        fprintf (stderr, "%lc", character);
+      else fprintf (stderr, " ");
+
+      //Encode to UTF-8
+      ptr += utf8_encode(character, alias_string+ptr);
+
+      //debug
+      // fprintf (stderr, " [%04X], ", character);
+    }
+  }
+
+  //assign to string for event history and ncurses display
+  uint32_t source = 0;
+  if (slot == 0)
+    source = state->lastsrc;
+  else source = state->lastsrcR;
+
+  if (state->event_history_s[slot].Event_History_Items[0].source_id == source)
+    sprintf (state->event_history_s[slot].Event_History_Items[0].alias, "%s; ", alias_string);
+  sprintf (state->generic_talker_alias[slot], "Talker Alias: %s; ", alias_string);
+
+}
--- a/src/dsd_audio.c
+++ b/src/dsd_audio.c
@@ -75,7 +75,7 @@ void openPulseOutput(dsd_opts * opts)
  pa_channel_map* fl = 0; //NULL and 0 are same in this context
  pa_channel_map* ss = 0; //NULL and 0 are same in this context

-  if (opts->floating_point == 0)
+  if (opts->floating_point == 0 && opts->analog_only == 0)
  {
    opts->pulse_digi_dev_out = pa_simple_new(NULL, "DSD-FME", PA_STREAM_PLAYBACK, dev, opts->output_name, &tt, ss, NULL, &err);

@@ -89,7 +89,7 @@ void openPulseOutput(dsd_opts * opts)
    }
  }

-  if (opts->floating_point == 1)
+  if (opts->floating_point == 1 && opts->analog_only == 0)
  {
    opts->pulse_digi_dev_out = pa_simple_new(NULL, "DSD-FME", PA_STREAM_PLAYBACK, dev, opts->output_name, &ff, fl, NULL, &err);

@@ -137,9 +137,11 @@ void openPulseInput(dsd_opts * opts)
  lt.maxlength = -1;
  lt.prebuf = -1;
  lt.tlength = -1;
-  if (opts->m17encoder == 1)
-    opts->pulse_digi_dev_in  = pa_simple_new(NULL, "DSD-FME4", PA_STREAM_RECORD, dev, "M17 Voice Input", &cc, NULL, &lt, &err);
-  else opts->pulse_digi_dev_in  = pa_simple_new(NULL, "DSD-FME", PA_STREAM_RECORD, dev, opts->output_name, &cc, NULL, &lt, &err);
+  // if (opts->m17encoder == 1)
+  //   opts->pulse_digi_dev_in  = pa_simple_new(NULL, "DSD-FME4", PA_STREAM_RECORD, dev, "M17 Voice Input", &cc, NULL, &lt, &err);
+  // else opts->pulse_digi_dev_in  = pa_simple_new(NULL, "DSD-FME", PA_STREAM_RECORD, dev, opts->output_name, &cc, NULL, &lt, &err);
+
+  opts->pulse_digi_dev_in  = pa_simple_new(NULL, "DSD-FME", PA_STREAM_RECORD, dev, opts->output_name, &cc, NULL, &lt, &err);

  if (err != 0)
  {
@@ -189,7 +191,7 @@ void parse_pulse_output_string (dsd_opts * opts, char * input)

 void openOSSOutput (dsd_opts * opts)
 {
-  int fmt; 
+  int fmt;
  int speed = 48000;
  if (opts->audio_in_type == 5) //if((strncmp(opts->audio_in_dev, "/dev/dsp", 8) == 0)) or 'split' == 0
  {
@@ -229,14 +231,14 @@ void openOSSOutput (dsd_opts * opts)
        fprintf (stderr, "ioctl setfmt error \n");
      }

-      opts->audio_out_type = 5; //5 for 1 channel - 48k OSS 16-bit short output (matching with input) 
+      opts->audio_out_type = 5; //5 for 1 channel - 48k OSS 16-bit short output (matching with input)
      opts->pulse_digi_rate_out = 48000; //this is used to force to upsample and also allow source audio monitor conditional check
      opts->pulse_digi_out_channels = 1; //this is used to allow source audio monitor conditional check
      opts->audio_gain = 0;
    }
  }

-  if (opts->audio_in_type != 5) //split == 1
+  if (opts->audio_in_type != 5 || opts->split == 1) //split == 1
  {

    if((strncmp(opts->audio_out_dev, "/dev/dsp", 8) == 0))
@@ -250,7 +252,7 @@ void openOSSOutput (dsd_opts * opts)
        exit(1);
      }

-      //Setup the device. Note that it's important to set the sample format, number of channels and sample rate exactly in this order. Some devices depend on the order. 
+      //Setup the device. Note that it's important to set the sample format, number of channels and sample rate exactly in this order. Some devices depend on the order.

      fmt = 0;
      if (ioctl (opts->audio_out_fd, SNDCTL_DSP_RESET) < 0)
@@ -282,7 +284,7 @@ void openOSSOutput (dsd_opts * opts)
      }
      if (opts->pulse_digi_out_channels == 2)
        fmt = 1;
-      else fmt = 0; 
+      else fmt = 0;

      if (ioctl (opts->audio_out_fd, SNDCTL_DSP_STEREO, &fmt) < 0)
      {
@@ -296,7 +298,7 @@ void openOSSOutput (dsd_opts * opts)
        opts->audio_out_type = 2;
      else opts->audio_out_type = 5;

-      //debug 
+      //debug
      fprintf (stderr, "Using OSS Output with %dk/%d channel configuration.\n", opts->pulse_digi_rate_out, opts->pulse_digi_out_channels);
    }
  }
@@ -650,6 +652,42 @@ void writeSynthesizedVoiceR (dsd_opts * opts, dsd_state * state)

 }

+//short Mono to Stereo version for new static .wav files in stereo format for TDMA
+void writeSynthesizedVoiceMS (dsd_opts * opts, dsd_state * state)
+{
+  int n;
+  short aout_buf[160];
+  short *aout_buf_p;
+
+  aout_buf_p = aout_buf;
+  state->audio_out_temp_buf_p = state->audio_out_temp_buf;
+
+  for (n = 0; n < 160; n++)
+  {
+    if (*state->audio_out_temp_buf_p > (float) 32767)
+      {
+        *state->audio_out_temp_buf_p = (float) 32767;
+      }
+    else if (*state->audio_out_temp_buf_p < (float) -32768)
+      {
+        *state->audio_out_temp_buf_p = (float) -32768;
+      }
+      *aout_buf_p = (short) *state->audio_out_temp_buf_p;
+      aout_buf_p++;
+      state->audio_out_temp_buf_p++;
+  }
+
+  short ss[320];
+  for (n = 0; n < 160; n++)
+  {
+    ss[(n*2)+0] = aout_buf[n];
+    ss[(n*2)+1] = aout_buf[n];
+  }
+
+  sf_write_short(opts->wav_out_f, ss, 320);
+
+}
+
 void writeRawSample (dsd_opts * opts, dsd_state * state, short sample)
 {
  UNUSED(state);
@@ -682,7 +720,7 @@ playSynthesizedVoice (dsd_opts * opts, dsd_state * state)
    state->audio_out_idx2 = 0;
    state->audio_out_idx = 0;
    goto end_psv;
-  } 
+  }

  if (state->audio_out_idx > opts->delay)
  {
@@ -694,7 +732,7 @@ playSynthesizedVoice (dsd_opts * opts, dsd_state * state)
    }
 		else if (opts->audio_out_type == 0)
    {
-      pa_simple_write(opts->pulse_digi_dev_out, (state->audio_out_buf_p - state->audio_out_idx), (state->audio_out_idx * 2), NULL); 
+      pa_simple_write(opts->pulse_digi_dev_out, (state->audio_out_buf_p - state->audio_out_idx), (state->audio_out_idx * 2), NULL);
      state->audio_out_idx = 0;
    }
    else if (opts->audio_out_type == 8) //UDP Audio Out -- Forgot some things still use this for now
@@ -737,7 +775,7 @@ playSynthesizedVoiceR (dsd_opts * opts, dsd_state * state)
    }
 		else if (opts->audio_out_type == 0)
    {
-      pa_simple_write(opts->pulse_digi_dev_outR, (state->audio_out_buf_pR - state->audio_out_idxR), (state->audio_out_idxR * 2), NULL); 
+      pa_simple_write(opts->pulse_digi_dev_outR, (state->audio_out_buf_pR - state->audio_out_idxR), (state->audio_out_idxR * 2), NULL);
      state->audio_out_idxR = 0;
    }
    else if (opts->audio_out_type == 8) //UDP Audio Out -- Not sure how this would handle, but R never gets called anymore, so just here for symmetry
@@ -901,11 +939,11 @@ openAudioInDevice (dsd_opts * opts)
  }

  //test .rrc files with hardset wav file settings
-  else if (strncmp(extension, ".rrc", 3) == 0)
+  else if (strncmp(extension, ".rrc", 4) == 0)
 	{
    //debug
    fprintf (stderr, "Opening M17 .rrc headless wav file\n");
-    
+
    opts->audio_in_type = 2;
    opts->audio_in_file_info = calloc(1, sizeof(SF_INFO));
    opts->audio_in_file_info->samplerate = 48000;
@@ -921,19 +959,19 @@ openAudioInDevice (dsd_opts * opts)
    }
 	}

-  //TODO: test .sym files as symbol capture .bin files
-  else if (strncmp(extension, ".sym", 3) == 0)
+  //Open .raw files as a float input type
+  else if (strncmp(extension, ".raw", 4) == 0)
 	{
    struct stat stat_buf;
    if (stat(opts->audio_in_dev, &stat_buf) != 0)
    {
-      fprintf (stderr,"Error, couldn't open bin file %s\n", opts->audio_in_dev);
+      fprintf (stderr,"Error, couldn't open raw (float) file %s\n", opts->audio_in_dev);
      exit(1);
    }
    if (S_ISREG(stat_buf.st_mode))
    {
      opts->symbolfile = fopen(opts->audio_in_dev, "r");
-      opts->audio_in_type = 4; //symbol capture bin files
+      opts->audio_in_type = 44; //float symbol input
    }
    else
    {
@@ -941,7 +979,27 @@ openAudioInDevice (dsd_opts * opts)
    }
  }

-  else if (strncmp(extension, ".bin", 3) == 0)
+  //Open .raw files as a float input type
+  else if (strncmp(extension, ".sym", 4) == 0)
+	{
+    struct stat stat_buf;
+    if (stat(opts->audio_in_dev, &stat_buf) != 0)
+    {
+      fprintf (stderr,"Error, couldn't open sym (float) file %s\n", opts->audio_in_dev);
+      exit(1);
+    }
+    if (S_ISREG(stat_buf.st_mode))
+    {
+      opts->symbolfile = fopen(opts->audio_in_dev, "r");
+      opts->audio_in_type = 44; //float symbol input
+    }
+    else
+    {
+      opts->audio_in_type = 0;
+    }
+  }
+
+  else if (strncmp(extension, ".bin", 4) == 0)
 	{
    struct stat stat_buf;
    if (stat(opts->audio_in_dev, &stat_buf) != 0)
@@ -972,8 +1030,8 @@ openAudioInDevice (dsd_opts * opts)
    {
      opts->audio_in_type = 2; //two now, seperating STDIN and wav files
      opts->audio_in_file_info = calloc(1, sizeof(SF_INFO));
-      opts->audio_in_file_info->samplerate=opts->wav_sample_rate; 
-      opts->audio_in_file_info->channels=1; 
+      opts->audio_in_file_info->samplerate=opts->wav_sample_rate;
+      opts->audio_in_file_info->channels=1;
      opts->audio_in_file_info->channels = 1;
      opts->audio_in_file_info->seekable=0;
      opts->audio_in_file_info->format=SF_FORMAT_RAW|SF_FORMAT_PCM_16|SF_ENDIAN_LITTLE;
--- a/src/dsd_audio2.c
+++ b/src/dsd_audio2.c
@@ -1,9 +1,9 @@
 /*-------------------------------------------------------------------------------
- * 
- * 
+ *
+ *
 *
 * TODO: Fill me in'
- * 
+ *
 *
 * LWVMOBILE
 * 2023-10 DSD-FME Florida Man Edition
@@ -15,7 +15,7 @@
 //NOTE: Tones produce ringing sound when put through the hpf_d, may want to look into tweaking it,
 //or looking for a way to store is_tone by glancing at ambe_d values and not running hpf_d on them

-//TODO: WAV File saving (works fine on shorts, but on float, writing short to wav is not auto-gained, 
+//TODO: WAV File saving (works fine on shorts, but on float, writing short to wav is not auto-gained,
 //so super quiet, either convert to float wav files, or run processAudio AFTER memcpy of the temp_buf)

 //simple method -- produces cleaner results, but can be muted (or very loud) at times
@@ -36,7 +36,7 @@

 //   if (opts->audio_gain != 0 && slot == 1)
 //     gain = state->aout_gainR / 25.0f;
-  
+
 //   //mono output handles slightly different, need to further decimate
 //   if (opts->pulse_digi_out_channels == 1)
 //     df *= 4.0f;
@@ -55,7 +55,7 @@

 //     //user gain factor
 //     samp[i] *= gain;
-    
+
 //   }

 // }
@@ -93,13 +93,21 @@ void playSynthesizedVoiceFS3 (dsd_opts * opts, dsd_state * state)
        encL = 0;
      }
    }
-    else if (state->payload_algid == 0x21)
+    else if (state->payload_algid == 0x02 || state->payload_algid == 0x21 || state->payload_algid == 0x22)
    {
      if (state->R != 0)
      {
        encL = 0;
      }
    }
+    else if (state->payload_algid == 0x24 || state->payload_algid == 0x25 || state->payload_algid == 0x36 || state->payload_algid == 0x37)
+    {
+      //going to need a better check for this later on, or seperated keys or something
+      if (state->aes_key_loaded[0] == 1)
+      {
+        encL = 0;
+      }
+    }
  }

  if (encR)
@@ -111,15 +119,27 @@ void playSynthesizedVoiceFS3 (dsd_opts * opts, dsd_state * state)
        encR = 0;
      }
    }
-    else if (state->payload_algidR == 0x21)
+    else if (state->payload_algidR == 0x02 ||state->payload_algidR == 0x21 || state->payload_algidR == 0x22)
    {
      if (state->RR != 0)
      {
        encR = 0;
      }
    }
+    else if (state->payload_algidR == 0x24 || state->payload_algidR == 0x25 || state->payload_algidR == 0x36 || state->payload_algidR == 0x37)
+    {
+      //going to need a better check for this later on, or seperated keys or something
+      if (state->aes_key_loaded[1] == 1)
+      {
+        encR = 0;
+      }
+    }
  }

+  //debug disable enc check for AES testing
+  // encL = 0;
+  // encR = 0;
+
  //TODO: add option to bypass enc with a toggle as well

  //CHEAT: Using the slot on/off, use that to set encL or encR back on
@@ -312,6 +332,20 @@ void playSynthesizedVoiceFS4 (dsd_opts * opts, dsd_state * state)
        encL = 0;
      }
    }
+    else if (state->payload_algid == 0x81)
+    {
+      if (state->R != 0)
+      {
+        encL = 0;
+      }
+    }
+    else if (state->payload_algid == 0x84 || state->payload_algid == 0x89)
+    {
+      if (state->aes_key_loaded[0] == 1)
+      {
+        encL = 0;
+      }
+    }
  }

  if (encR)
@@ -323,6 +357,20 @@ void playSynthesizedVoiceFS4 (dsd_opts * opts, dsd_state * state)
        encR = 0;
      }
    }
+    else if (state->payload_algidR == 0x81)
+    {
+      if (state->R != 0)
+      {
+        encR = 0;
+      }
+    }
+    else if (state->payload_algidR == 0x84 || state->payload_algidR == 0x89)
+    {
+      if (state->aes_key_loaded[1] == 1)
+      {
+        encR = 0;
+      }
+    }
  }

  //CHEAT: Using the slot on/off, use that to set encL or encR back on
@@ -516,17 +564,24 @@ void playSynthesizedVoiceFS (dsd_opts * opts, dsd_state * state)
      encL = 1;
    }
  }
-  
+
  //checkdown to see if we can lift the 'mute' if a key is available
  if (encL)
  {
-    if (state->payload_algid == 0xAA)
+    if (state->payload_algid == 0xAA || state->payload_algid == 0x81 || state->payload_algid == 0x9F)
    {
      if (state->R != 0)
      {
        encL = 0;
      }
    }
+    else if (state->payload_algid == 0x84 || state->payload_algid == 0x89 || state->payload_algid == 0x83)
+    {
+      if (state->aes_key_loaded[0] == 1)
+      {
+        encL = 0;
+      }
+    }
  }

  //TODO: add option to bypass enc with a toggle as well
@@ -627,7 +682,7 @@ void playSynthesizedVoiceFS (dsd_opts * opts, dsd_state * state)

 void playSynthesizedVoiceFM (dsd_opts * opts, dsd_state * state)
 {
-  
+
  agf(opts, state, state->f_l,0);

  //mono may need an additional decimation
@@ -654,13 +709,20 @@ void playSynthesizedVoiceFM (dsd_opts * opts, dsd_state * state)
  //checkdown to see if we can lift the 'mute' if a key is available
  if (encL)
  {
-    if (state->payload_algid == 0xAA || state->nxdn_cipher_type == 0x1)
+    if (state->payload_algid == 0xAA || state->payload_algid == 0x81 || state->payload_algid == 0x83 || state->payload_algid == 0x9F || state->nxdn_cipher_type == 0x1 || state->nxdn_cipher_type == 0x2)
    {
      if (state->R != 0)
      {
        encL = 0;
      }
    }
+    else if (state->payload_algid == 0x84 || state->payload_algid == 0x89 || state->nxdn_cipher_type == 0x3 || state->payload_algid == 0x36 || state->payload_algid == 0x37)
+    {
+      if (state->aes_key_loaded[0] == 1)
+      {
+        encL = 0;
+      }
+    }
  }

  //WIP: Mute if on B list (or not W list)
@@ -718,7 +780,7 @@ void playSynthesizedVoiceFM (dsd_opts * opts, dsd_state * state)
    memset (state->audio_out_buf, 0, 100 * sizeof (short));
    state->audio_out_idx2 = 0;
  }
-  
+
  memset (state->f_l, 0.0f, sizeof(state->f_l));
  memset (state->audio_out_temp_buf, 0.0f, sizeof(state->audio_out_temp_buf));

@@ -766,6 +828,31 @@ void playSynthesizedVoiceMS (dsd_opts * opts, dsd_state * state)
  if (opts->audio_out_type == 1 || opts->audio_out_type == 2 || opts->audio_out_type == 5) //STDOUT or OSS
    write (opts->audio_out_fd, mono_samp, len*2);

+  //this one needs testing w/ 48000 OSS output when audio is not split
+  if (opts->wav_out_f != NULL && opts->static_wav_file == 1)
+  {
+    //convert to stereo for new static wav file setup
+    short ss[320];
+    memset (ss, 0, sizeof(ss));
+    if (len == 160)
+    {
+      for (i = 0; i < 160; i++)
+      {
+        ss[(i*2)+0] = mono_samp[i];
+        ss[(i*2)+1] = mono_samp[i];
+      }
+    }
+    else if (len == 960)
+    {
+      for (i = 0; i < 160; i++)
+      {
+        ss[(i*2)+0] = mono_samp[i*6]; //grab every 6th sample to downsample
+        ss[(i*2)+1] = mono_samp[i*6]; //grab every 6th sample to downsample
+      }
+    }
+    sf_write_short(opts->wav_out_f, ss, 320);
+  }
+
  MS_END:

  //run cleanup since we pulled stuff from processAudio
@@ -827,6 +914,31 @@ void playSynthesizedVoiceMSR (dsd_opts * opts, dsd_state * state)
  if (opts->audio_out_type == 1 || opts->audio_out_type == 2 || opts->audio_out_type == 5) //STDOUT or OSS
    write (opts->audio_out_fd, mono_samp, len*2);

+  //this one needs testing w/ 48000 OSS output when audio is not split
+  if (opts->wav_out_f != NULL && opts->static_wav_file == 1)
+  {
+    //convert to stereo for new static wav file setup
+    short ss[320];
+    memset (ss, 0, sizeof(ss));
+    if (len == 160)
+    {
+      for (i = 0; i < 160; i++)
+      {
+        ss[(i*2)+0] = mono_samp[i];
+        ss[(i*2)+1] = mono_samp[i];
+      }
+    }
+    else if (len == 960)
+    {
+      for (i = 0; i < 160; i++)
+      {
+        ss[(i*2)+0] = mono_samp[i*6]; //grab every 6th sample to downsample
+        ss[(i*2)+1] = mono_samp[i*6]; //grab every 6th sample to downsample
+      }
+    }
+    sf_write_short(opts->wav_out_f, ss, 320);
+  }
+
  MS_ENDR:

  //run cleanup since we pulled stuff from processAudioR
@@ -870,13 +982,20 @@ void playSynthesizedVoiceSS (dsd_opts * opts, dsd_state * state)
  //checkdown to see if we can lift the 'mute' if a key is available
  if (encL)
  {
-    if (state->payload_algid == 0xAA)
+    if (state->payload_algid == 0xAA || state->payload_algid == 0x81 || state->payload_algid == 0x9F || state->payload_algid == 0x83)
    {
      if (state->R != 0)
      {
        encL = 0;
      }
    }
+    else if (state->payload_algid == 0x84 || state->payload_algid == 0x89)
+    {
+      if (state->aes_key_loaded[0] == 1)
+      {
+        encL = 0;
+      }
+    }
  }
  //TODO: add option to bypass enc with a toggle as well

@@ -939,6 +1058,8 @@ void playSynthesizedVoiceSS (dsd_opts * opts, dsd_state * state)
  if (opts->audio_out_type == 1 || opts->audio_out_type == 2) //STDOUT or OSS 8k/2
    write (opts->audio_out_fd, stereo_samp1, 320*2);

+  if (opts->wav_out_f != NULL && opts->static_wav_file == 1)
+    sf_write_short(opts->wav_out_f, stereo_samp1, 320);

  SSM_END:

@@ -993,7 +1114,7 @@ void playSynthesizedVoiceSS3 (dsd_opts * opts, dsd_state * state)
  encL = (state->dmr_so  >> 6) & 0x1;
  encR = (state->dmr_soR >> 6) & 0x1;

-  //checkdown to see if we can lift the 'mute' if a key is available
+ //checkdown to see if we can lift the 'mute' if a key is available
  if (encL)
  {
    if (state->payload_algid == 0)
@@ -1003,13 +1124,21 @@ void playSynthesizedVoiceSS3 (dsd_opts * opts, dsd_state * state)
        encL = 0;
      }
    }
-    else if (state->payload_algid == 0x21)
+    else if (state->payload_algid == 0x02 || state->payload_algid == 0x21 || state->payload_algid == 0x22)
    {
      if (state->R != 0)
      {
        encL = 0;
      }
    }
+    else if (state->payload_algid == 0x24 || state->payload_algid == 0x25 || state->payload_algid == 0x36 || state->payload_algid == 0x37)
+    {
+      //going to need a better check for this later on, or seperated keys or something
+      if (state->aes_key_loaded[0] == 1)
+      {
+        encL = 0;
+      }
+    }
  }

  if (encR)
@@ -1021,15 +1150,26 @@ void playSynthesizedVoiceSS3 (dsd_opts * opts, dsd_state * state)
        encR = 0;
      }
    }
-    else if (state->payload_algidR == 0x21)
+    else if (state->payload_algidR == 0x02 ||state->payload_algidR == 0x21 || state->payload_algidR == 0x22)
    {
      if (state->RR != 0)
      {
        encR = 0;
      }
    }
+    else if (state->payload_algidR == 0x24 || state->payload_algidR == 0x25 || state->payload_algidR == 0x36 || state->payload_algidR == 0x37)
+    {
+      //going to need a better check for this later on, or seperated keys or something
+      if (state->aes_key_loaded[1] == 1)
+      {
+        encR = 0;
+      }
+    }
  }

+  //debug for AES
+  // encL = encR = 0;
+
  //TODO: add option to bypass enc with a toggle as well

  //CHEAT: Using the slot on/off, use that to set encL or encR back on
@@ -1112,7 +1252,7 @@ void playSynthesizedVoiceSS3 (dsd_opts * opts, dsd_state * state)
  // }

  //if TG Hold in place, mute anything but that TG #132
-  if (state->tg_hold != 0 && state->tg_hold != TGL) 
+  if (state->tg_hold != 0 && state->tg_hold != TGL)
    encL = 1;
  if (state->tg_hold != 0 && state->tg_hold != TGR)
    encR = 1;
@@ -1270,6 +1410,13 @@ void playSynthesizedVoiceSS3 (dsd_opts * opts, dsd_state * state)
    write (opts->audio_out_fd, stereo_samp3, 320*2);
  }

+  if (opts->wav_out_f != NULL && opts->static_wav_file == 1)
+  {
+    sf_write_short(opts->wav_out_f, stereo_samp1, 320);
+    sf_write_short(opts->wav_out_f, stereo_samp2, 320);
+    sf_write_short(opts->wav_out_f, stereo_samp3, 320);
+  }
+
  SS3_END:

  //run cleanup since we pulled stuff from processAudio
@@ -1342,6 +1489,20 @@ void playSynthesizedVoiceSS4 (dsd_opts * opts, dsd_state * state)
        encL = 0;
      }
    }
+    else if (state->payload_algid == 0x81)
+    {
+      if (state->R != 0)
+      {
+        encL = 0;
+      }
+    }
+    else if (state->payload_algid == 0x84 || state->payload_algid == 0x89)
+    {
+      if (state->aes_key_loaded[0] == 1)
+      {
+        encL = 0;
+      }
+    }
  }

  if (encR)
@@ -1353,6 +1514,20 @@ void playSynthesizedVoiceSS4 (dsd_opts * opts, dsd_state * state)
        encR = 0;
      }
    }
+    else if (state->payload_algidR == 0x81)
+    {
+      if (state->R != 0)
+      {
+        encR = 0;
+      }
+    }
+    else if (state->payload_algidR == 0x84 || state->payload_algidR == 0x89)
+    {
+      if (state->aes_key_loaded[1] == 1)
+      {
+        encR = 0;
+      }
+    }
  }


@@ -1482,7 +1657,7 @@ void playSynthesizedVoiceSS4 (dsd_opts * opts, dsd_state * state)
    if (memcmp(empty, stereo_samp4, sizeof(empty)) != 0)
      udp_socket_blaster (opts, state, 320*2, stereo_samp4);
  }
-  
+

  if (opts->audio_out_type == 1 || opts->audio_out_type == 2) //STDOUT or OSS 8k/2channel
  {
@@ -1495,6 +1670,18 @@ void playSynthesizedVoiceSS4 (dsd_opts * opts, dsd_state * state)
      write (opts->audio_out_fd, stereo_samp4, 320*2);
  }

+  if (opts->wav_out_f != NULL && opts->static_wav_file == 1)
+  {
+    sf_write_short(opts->wav_out_f, stereo_samp1, 320);
+    sf_write_short(opts->wav_out_f, stereo_samp2, 320);
+
+    //only write these two if not a single 2v or double 2v
+    if (memcmp(empty, stereo_samp3, sizeof(empty)) != 0)
+      sf_write_short(opts->wav_out_f, stereo_samp3, 320);
+    if (memcmp(empty, stereo_samp4, sizeof(empty)) != 0)
+      sf_write_short(opts->wav_out_f, stereo_samp4, 320);
+  }
+
  SS4_END:

  //run cleanup since we pulled stuff from processAudio
@@ -1552,26 +1739,52 @@ void playSynthesizedVoiceSS18 (dsd_opts * opts, dsd_state * state)
  //checkdown to see if we can lift the 'mute' if a key is available
  if (encL)
  {
-    if (state->payload_algid == 0xAA)
+    //RC4 or DES
+    if (state->payload_algid == 0xAA || state->payload_algid == 0x81)
    {
      if (state->R != 0)
      {
        encL = 0;
      }
    }
+
+    //AES
+    if (state->payload_algid == 0x84 || state->payload_algid == 0x89)
+    {
+      if (state->aes_key_loaded[0] == 1)
+      {
+        encL = 0;
+      }
+    }
+
  }

  if (encR)
  {
-    if (state->payload_algidR == 0xAA)
+    //RC4 or DES
+    if (state->payload_algidR == 0xAA || state->payload_algidR == 0x81)
    {
      if (state->RR != 0)
      {
        encR = 0;
      }
    }
+
+    //AES
+    if (state->payload_algidR == 0x84 || state->payload_algidR == 0x89)
+    {
+      if (state->aes_key_loaded[1] == 1)
+      {
+        encR = 0;
+      }
+    }
+
  }

+  //debug, unmute both slots
+  // encL = 0;
+  // encR = 0;
+
  //WIP: Mute if on B list (or not W list)
  char modeL[8];
  sprintf (modeL, "%s", "");
@@ -1647,7 +1860,7 @@ void playSynthesizedVoiceSS18 (dsd_opts * opts, dsd_state * state)
  // }

  //if TG Hold in place, mute anything but that TG #132
-  if (state->tg_hold != 0 && state->tg_hold != TGL) 
+  if (state->tg_hold != 0 && state->tg_hold != TGL)
    encL = 1;
  if (state->tg_hold != 0 && state->tg_hold != TGR)
    encR = 1;
@@ -1762,7 +1975,7 @@ void playSynthesizedVoiceSS18 (dsd_opts * opts, dsd_state * state)
        udp_socket_blaster (opts, state, 320*2, stereo_sf[j]);
    }
  }
-  
+

  if (opts->audio_out_type == 1 || opts->audio_out_type == 2) //STDOUT or OSS 8k/2channel
  {
@@ -1773,6 +1986,15 @@ void playSynthesizedVoiceSS18 (dsd_opts * opts, dsd_state * state)
    }
  }

+  if (opts->wav_out_f != NULL && opts->static_wav_file == 1)
+  {
+    for (j = 0; j < 18; j++)
+    {
+      if (memcmp(empty, stereo_sf[j], sizeof(empty)) != 0)
+        sf_write_short(opts->wav_out_f, stereo_sf[j], 320);
+    }
+  }
+
  SS18_END:

  //run cleanup since we pulled stuff from processAudio
@@ -1891,7 +2113,7 @@ void agf (dsd_opts * opts, dsd_state * state, float samp[160], int slot)

    aavg /= 20.0f; //average of the 20 samples

-    //debug 
+    //debug
    // fprintf (stderr, "\nS%d - DF = %f AAVG = %f", slot, df, aavg);

    if (slot == 0)
@@ -1909,7 +2131,7 @@ void agf (dsd_opts * opts, dsd_state * state, float samp[160], int slot)
    aavg = 0.0f; //reset

  } //j loop
-  
+
  AGF_END: ; //do nothing

 }
@@ -1946,7 +2168,7 @@ void agsm (dsd_opts * opts, dsd_state * state, short * input, int len)
    avg += (float)samp[i];

  avg /= (float)len;
-  
+
  coeff = fabsf (nom / max);

  //keep coefficient with tolerable range when silence to prevent crackle/buzz
@@ -1955,7 +2177,7 @@ void agsm (dsd_opts * opts, dsd_state * state, short * input, int len)
  //apply the coefficient to bring the max value to our desired maximum value
  for (i = 0; i < 20; i++)
    samp[i] *= coeff;
-    
+
  //debug
  // fprintf (stderr, "\n M: %f; C: %f; A: %f; ", max, coeff, avg);

@@ -1965,7 +2187,7 @@ void agsm (dsd_opts * opts, dsd_state * state, short * input, int len)
  //   fprintf (stderr, " in: %d", input[i]);
  //   fprintf (stderr, " out: %f", samp[i]);
  // }
-    
+
  //return new smaple values post agc
  for (i = 0; i < len; i++)
    input[i] = (short)samp[i];
@@ -1985,4 +2207,128 @@ void analog_gain (dsd_opts * opts, dsd_state * state, short * input, int len)

  for (i = 0; i < len; i++)
    input[i] *= gain;
+}
+
+void beeper (dsd_opts * opts, dsd_state * state, int lr, int id, int ad, int len)
+{
+  UNUSED(state);
+  int i, j, n;
+  //use lr as left or right channel designation in stereo config
+  float samp_f[160];  //mono float sample
+  float samp_fs[320]; //stereo float sample
+  short samp_s[160];  //mono short sample
+  short samp_ss[320]; //stereo short sample
+  short samp_su[960]; //mono short upsample
+  short outbuf[6];    //temp storage for upsample
+
+  n = 0; //rolling sine wave 'degree'
+
+  //double len if not using Pulse Audio,
+  //anything over UDP or using OSS may 
+  //not clear the buffer at the shorter len
+  if (opts->audio_out_type != 0)
+    len *= 2;
+
+  //each j increment is 20 ms at 160 samples / 8 kHz
+  for (j = 0; j < len; j++)
+  {
+    //'zero' out stereo mix samples
+    memset (samp_fs, 0, sizeof(samp_fs));
+    memset (samp_ss, 0, sizeof(samp_ss));
+
+    //generate a tone with supplied tone ID and AD value
+    soft_tonef(samp_f, n, id, ad);
+
+    //convert float to short if required
+    if (opts->floating_point == 0)
+    {
+      mbe_floattoshort(samp_f, samp_s);
+      for (i = 0; i < 160; i++)
+      {
+        samp_s[i] *= 4000; //apply gain
+        samp_ss[(i*2)+lr] = samp_s[i];
+      }
+    }
+
+    //load returned tone sample into appropriate channel -- left = +0; right = +1;
+    for (i = 0; i < 160; i++)
+      samp_fs[(i*2)+lr] = samp_f[i];
+
+    //play sample 3 times (20ms x 3 = 60ms)
+    if (opts->audio_out_type == 0) //Pulse Audio
+    {
+      if (opts->pulse_digi_out_channels == 2 && opts->floating_point == 1)
+        pa_simple_write(opts->pulse_digi_dev_out, samp_fs, 320*4, NULL);
+
+      if (opts->pulse_digi_out_channels == 1 && opts->floating_point == 1)
+        pa_simple_write(opts->pulse_digi_dev_out, samp_f,  160*4, NULL);
+
+      if (opts->pulse_digi_out_channels == 2 && opts->floating_point == 0)
+        pa_simple_write(opts->pulse_digi_dev_out, samp_ss, 320*2, NULL);
+
+      if (opts->pulse_digi_out_channels == 1 && opts->floating_point == 0)
+        pa_simple_write(opts->pulse_digi_dev_out, samp_s,  160*2, NULL);
+
+    }
+
+    else if (opts->audio_out_type == 8) //UDP Audio
+    {
+      if (opts->pulse_digi_out_channels == 2 && opts->floating_point == 1)
+        udp_socket_blaster (opts, state, 320*4, samp_fs);
+
+      if (opts->pulse_digi_out_channels == 1 && opts->floating_point == 1)
+        udp_socket_blaster (opts, state, 160*4, samp_f);
+
+      if (opts->pulse_digi_out_channels == 2 && opts->floating_point == 0)
+        udp_socket_blaster (opts, state, 320*2, samp_ss);
+
+      if (opts->pulse_digi_out_channels == 1 && opts->floating_point == 0)
+        udp_socket_blaster (opts, state, 160*2, samp_s);
+
+    }
+
+    else if (opts->audio_out_type == 1) //STDOUT
+    {
+      if (opts->pulse_digi_out_channels == 2 && opts->floating_point == 1)
+        write(opts->audio_out_fd, samp_fs, 320*4);
+
+      if (opts->pulse_digi_out_channels == 1 && opts->floating_point == 1)
+        write(opts->audio_out_fd, samp_f,  160*4);
+
+      if (opts->pulse_digi_out_channels == 2 && opts->floating_point == 0)
+        write(opts->audio_out_fd, samp_ss, 320*2);
+
+      if (opts->pulse_digi_out_channels == 1 && opts->floating_point == 0)
+        write(opts->audio_out_fd, samp_s,  160*2);
+    }
+
+    else if (opts->audio_out_type == 2) //OSS Variable Output (no float)
+    {
+
+      if (opts->pulse_digi_out_channels == 2 && opts->floating_point == 0)
+        write(opts->audio_out_fd, samp_ss, 320*2);
+
+      if (opts->pulse_digi_out_channels == 1 && opts->floating_point == 0)
+        write(opts->audio_out_fd, samp_s,  160*2);
+    }
+
+    else if (opts->audio_out_type == 5) //OSS 48k/1 configuration with upsample
+    {
+      short prev = 0;
+      for (i = 0; i < 160; i++)
+      {
+        upsampleS (samp_s[i], prev, outbuf);
+        samp_su[(i*6)+0] = outbuf[0];
+        samp_su[(i*6)+1] = outbuf[1];
+        samp_su[(i*6)+2] = outbuf[2];
+        samp_su[(i*6)+3] = outbuf[3];
+        samp_su[(i*6)+4] = outbuf[4];
+        samp_su[(i*6)+5] = outbuf[5];
+      }
+
+      write (opts->audio_out_fd, samp_su, 960*2);
+    }
+
+  }
+
 }
--- a/src/dsd_dibit.c
+++ b/src/dsd_dibit.c
@@ -267,7 +267,7 @@ int digitize (dsd_opts* opts, dsd_state* state, int symbol)
  else if ((state->synctype == 1) || (state->synctype == 3)  || (state->synctype == 5)  ||
          (state->synctype == 9)  || (state->synctype == 11) || (state->synctype == 13) ||
          (state->synctype == 17) || (state->synctype == 29) || (state->synctype == 31) ||
-          (state->synctype == 77) || (state->synctype == 87) ||(state->synctype == 36) || 
+          (state->synctype == 77) || (state->synctype == 87) ||(state->synctype == 36) ||
          (state->synctype == 99)                              )

    {
@@ -279,8 +279,8 @@ int digitize (dsd_opts* opts, dsd_state* state, int symbol)
      // 13 -DMR (inverted signal data frame)
      // 17 -M17 STR
      // 29 -NXDN (inverted FSW)
-      // 31 -YSF 
-      // 36 -P25p2 
+      // 31 -YSF
+      // 36 -P25p2
      // 77 -M17 BRT
      // 87 -M17 PKT
      // 99 -M17 Preamble
@@ -334,7 +334,7 @@ int digitize (dsd_opts* opts, dsd_state* state, int symbol)
      state->dibit_buf_p++;

      //dmr buffer
-      *state->dmr_payload_p = invert_dibit(dibit); 
+      *state->dmr_payload_p = invert_dibit(dibit);
      state->dmr_payload_p++;
      //dmr buffer end

@@ -449,13 +449,13 @@ get_dibit_and_analog_signal (dsd_opts* opts, dsd_state* state, int* out_analog_s

  dibit = digitize (opts, state, symbol);

-  if (opts->audio_in_type == 4) 
+  if (opts->audio_in_type == 4)
  {
    //assign dibit from last symbol/dibit read from capture bin
    dibit = state->symbolc;
    if (state->use_throttle == 1)
 		{
-			usleep(0); 
+			usleep(0);
 		}
  }

--- a/src/dsd_events.c
+++ b/src/dsd_events.c
@@ -0,0 +1,870 @@
+/*-------------------------------------------------------------------------------
+* dsd_events.c
+* DSD-FME event history init, watchdog, push, and related functions
+*
+*
+* LWVMOBILE
+* 2025-05 DSD-FME Florida Man Edition
+*-----------------------------------------------------------------------------*/
+
+#include "dsd.h" 
+#include "git_ver.h"
+#include "synctype.h"
+
+//init each event history struct passed into here
+void init_event_history (Event_History_I * event_struct, uint8_t start, uint8_t stop)
+{
+  for (uint8_t i = start; i < stop; i++)
+  {
+    event_struct->Event_History_Items[i].write = 0;
+    event_struct->Event_History_Items[i].color_pair = 4;
+    event_struct->Event_History_Items[i].systype = -1;
+    event_struct->Event_History_Items[i].subtype = -1;
+    event_struct->Event_History_Items[i].sys_id1 = 0;
+    event_struct->Event_History_Items[i].sys_id2 = 0;
+    event_struct->Event_History_Items[i].sys_id3 = 0;
+    event_struct->Event_History_Items[i].sys_id4 = 0;
+    event_struct->Event_History_Items[i].sys_id5 = 0;
+    event_struct->Event_History_Items[i].gi = 0;
+    event_struct->Event_History_Items[i].enc = 0;
+    event_struct->Event_History_Items[i].enc_alg = 0;
+    event_struct->Event_History_Items[i].enc_key = 0;
+    event_struct->Event_History_Items[i].mi = 0;
+    event_struct->Event_History_Items[i].svc = 0;
+    event_struct->Event_History_Items[i].source_id = 0;
+    event_struct->Event_History_Items[i].target_id = 0;
+    sprintf (event_struct->Event_History_Items[i].src_str, "%s", "BUMBLEBEETUNA");
+    sprintf (event_struct->Event_History_Items[i].tgt_str, "%s", "BUMBLEBEETUNA");
+    sprintf (event_struct->Event_History_Items[i].t_name,  "%s", "BUMBLEBEETUNA");
+    sprintf (event_struct->Event_History_Items[i].s_name,  "%s", "BUMBLEBEETUNA");
+    sprintf (event_struct->Event_History_Items[i].t_mode,  "%s", "BUMBLEBEETUNA");
+    sprintf (event_struct->Event_History_Items[i].s_mode,  "%s", "BUMBLEBEETUNA");
+    event_struct->Event_History_Items[i].channel = 0;
+    event_struct->Event_History_Items[i].event_time = 0;
+
+    memset  (event_struct->Event_History_Items[i].pdu, 0, sizeof(event_struct->Event_History_Items[0].pdu));
+    sprintf (event_struct->Event_History_Items[i].sysid_string, "%s", "");
+    sprintf (event_struct->Event_History_Items[i].alias, "%s", "BUMBLEBEETUNA");
+    sprintf (event_struct->Event_History_Items[i].gps_s, "%s", "BUMBLEBEETUNA");
+    sprintf (event_struct->Event_History_Items[i].text_message, "%s", "BUMBLEBEETUNA");
+    sprintf (event_struct->Event_History_Items[i].event_string, "%s", "BUMBLEBEETUNA");
+    sprintf (event_struct->Event_History_Items[i].internal_str, "%s", "BUMBLEBEETUNA");
+  }
+}
+
+void push_event_history (Event_History_I * event_struct)
+{
+
+  //Fixed, had it going in the wrong direction first time
+  for (uint8_t i = 254; i >= 1; i--)
+  {
+    event_struct->Event_History_Items[i].write = event_struct->Event_History_Items[i-1].write;
+    event_struct->Event_History_Items[i].color_pair = event_struct->Event_History_Items[i-1].color_pair;
+    event_struct->Event_History_Items[i].systype = event_struct->Event_History_Items[i-1].systype;
+    event_struct->Event_History_Items[i].subtype = event_struct->Event_History_Items[i-1].subtype;
+    event_struct->Event_History_Items[i].sys_id1 = event_struct->Event_History_Items[i-1].sys_id1;
+    event_struct->Event_History_Items[i].sys_id2 = event_struct->Event_History_Items[i-1].sys_id2;
+    event_struct->Event_History_Items[i].sys_id3 = event_struct->Event_History_Items[i-1].sys_id3;
+    event_struct->Event_History_Items[i].sys_id4 = event_struct->Event_History_Items[i-1].sys_id4;
+    event_struct->Event_History_Items[i].sys_id5 = event_struct->Event_History_Items[i-1].sys_id5;
+    event_struct->Event_History_Items[i].gi = event_struct->Event_History_Items[i-1].gi;
+    event_struct->Event_History_Items[i].enc = event_struct->Event_History_Items[i-1].enc;
+    event_struct->Event_History_Items[i].enc_alg = event_struct->Event_History_Items[i-1].enc_alg;
+    event_struct->Event_History_Items[i].enc_key = event_struct->Event_History_Items[i-1].enc_key;
+    event_struct->Event_History_Items[i].mi = event_struct->Event_History_Items[i-1].mi;
+    event_struct->Event_History_Items[i].svc = event_struct->Event_History_Items[i-1].svc;
+    event_struct->Event_History_Items[i].source_id = event_struct->Event_History_Items[i-1].source_id;
+    event_struct->Event_History_Items[i].target_id = event_struct->Event_History_Items[i-1].target_id;
+    sprintf (event_struct->Event_History_Items[i].src_str, "%s", event_struct->Event_History_Items[i-1].src_str);
+    sprintf (event_struct->Event_History_Items[i].tgt_str, "%s", event_struct->Event_History_Items[i-1].tgt_str);
+    sprintf (event_struct->Event_History_Items[i].t_name, "%s", event_struct->Event_History_Items[i-1].t_name);
+    sprintf (event_struct->Event_History_Items[i].s_name, "%s", event_struct->Event_History_Items[i-1].s_name);
+    sprintf (event_struct->Event_History_Items[i].t_mode, "%s", event_struct->Event_History_Items[i-1].t_mode);
+    sprintf (event_struct->Event_History_Items[i].s_mode, "%s", event_struct->Event_History_Items[i-1].s_mode);
+    event_struct->Event_History_Items[i].channel = event_struct->Event_History_Items[i-1].channel;
+    event_struct->Event_History_Items[i].event_time = event_struct->Event_History_Items[i+1].event_time;
+
+    memcpy  (event_struct->Event_History_Items[i].pdu, event_struct->Event_History_Items[i-1].pdu, sizeof(event_struct->Event_History_Items[0].pdu));
+    sprintf (event_struct->Event_History_Items[i].sysid_string, "%s", event_struct->Event_History_Items[i-1].sysid_string);
+    sprintf (event_struct->Event_History_Items[i].alias, "%s", event_struct->Event_History_Items[i-1].alias);
+    sprintf (event_struct->Event_History_Items[i].gps_s, "%s", event_struct->Event_History_Items[i-1].gps_s);
+    sprintf (event_struct->Event_History_Items[i].text_message, "%s", event_struct->Event_History_Items[i-1].text_message);
+    sprintf (event_struct->Event_History_Items[i].event_string, "%s", event_struct->Event_History_Items[i-1].event_string);
+    sprintf (event_struct->Event_History_Items[i].internal_str, "%s", event_struct->Event_History_Items[i-1].internal_str);
+  }
+}
+
+void write_event_to_log_file (dsd_opts * opts, dsd_state * state, uint8_t slot, uint8_t swrite, char * event_string) //pass completed event string here that is in the struct
+{
+
+  //open log file
+  FILE * event_log_file;
+  event_log_file = fopen(opts->event_out_file, "a");
+
+  fprintf (event_log_file, "%s ", event_string);
+  if (swrite == 1)
+    fprintf (event_log_file, "Slot %d; ", slot+1);
+  fprintf (event_log_file,"\n");
+
+  char text_string[2000]; sprintf (text_string, "%s", "BUMBLEBEETUNA");
+  if (strncmp(text_string, state->event_history_s[slot].Event_History_Items[0].text_message, 13) != 0)
+    fprintf (event_log_file, "%s \n", state->event_history_s[slot].Event_History_Items[0].text_message);
+  if (strncmp(text_string, state->event_history_s[slot].Event_History_Items[0].alias, 13) != 0)
+    fprintf (event_log_file, " Talker Alias: %s \n", state->event_history_s[slot].Event_History_Items[0].alias);
+  if (strncmp(text_string, state->event_history_s[slot].Event_History_Items[0].gps_s, 13) != 0)
+    fprintf (event_log_file, " GPS: %s \n", state->event_history_s[slot].Event_History_Items[0].gps_s);
+  if (strncmp(text_string, state->event_history_s[slot].Event_History_Items[0].internal_str, 13) != 0)
+    fprintf (event_log_file, " DSD-FME: %s \n", state->event_history_s[slot].Event_History_Items[0].internal_str);
+
+  //flush and close log file
+  fflush (event_log_file);
+  fclose (event_log_file);
+}
+
+// run once per loop to check for and push and update event history
+void watchdog_event_history (dsd_opts * opts, dsd_state * state, uint8_t slot)
+{
+
+  //create a pointer to the current slot event history
+  Event_History_I * event_struct = &state->event_history_s[slot];
+
+  //is this a TDMA slot (append Slot value to end of written event history)
+  uint8_t swrite = 0;
+
+  //who is currently talking
+  uint32_t source_id = 0;
+
+  //last values pulled from the event history
+  uint32_t last_source_id = event_struct->Event_History_Items[0].source_id;
+
+  if (slot == 0)
+    source_id = state->lastsrc;
+  else
+    source_id = state->lastsrcR;
+
+  //if DMR BS or P25P2, then flag the swrite, so write can append slot value to event history log //|| state->lastsynctype == 32 || state->lastsynctype == 33 || state->lastsynctype == 34　MS
+  if (state->lastsynctype == 10 || state->lastsynctype == 11 || state->lastsynctype == 12 || state->lastsynctype == 13)
+    swrite = 1;
+  
+  else if (state->lastsynctype == 35 || state->lastsynctype == 36)
+    swrite = 1;
+
+  if (slot == 0) //BUGFIX: generic catch on FDMA systems so that we don't write duplicate data to slot 2 event history
+  {
+    //NXDN RID (TODO: Changeover to lastsrc later on)
+    if (state->lastsynctype == 28 || state->lastsynctype == 29)
+      source_id = state->nxdn_last_rid;
+
+    if (state->lastsynctype == 30 || state->lastsynctype == 31) //YSF Fusion
+    {
+      source_id = 0;
+      if (strncmp(state->ysf_src, "          ", 10) != 0) //if this field does not have ten spaces in it
+      {
+        for (uint8_t i = 0; i < 11; i++)
+          source_id += state->ysf_src[i]; //convert to sum value to make a distinct enough src value
+      }
+    }
+
+    if (state->lastsynctype == 8 || state->lastsynctype == 9 || state->lastsynctype == 16 || state->lastsynctype == 17) //M17 STR
+    {
+      source_id = (uint32_t)state->m17_src;
+    }
+
+    if (state->lastsynctype == 6 || state->lastsynctype == 7 || state->lastsynctype == 18 || state->lastsynctype == 19) //DSTAR
+    {
+      source_id = 0;
+      for (uint8_t i = 0; i < 12; i++)
+        source_id += state->dstar_src[i]; //convert to sum value to make a distinct enough src value
+
+      //need a strncmp here for 8 spaces in this field first so we don't blip a blank into the event history
+      if (strncmp(state->dstar_src, "        ", 8) == 0)
+        source_id = 0;
+    }
+
+    if (state->lastsynctype == 20 || state->lastsynctype == 24 || state->lastsynctype == 21 || state->lastsynctype == 25 || state->lastsynctype == 22 || state->lastsynctype == 26 || state->lastsynctype == 23 || state->lastsynctype == 27) //dPMR
+    {
+      source_id = 0;
+      for (uint8_t i = 0; i < 20; i++)
+        source_id += state->dpmr_caller_id[i]; //convert to sum value to make a distinct enough src value
+
+      //need a strncmp here for 8 spaces in this field first so we don't blip a blank into the event history
+      if (strncmp(state->dpmr_caller_id, "      ", 6) == 0)
+        source_id = 0;
+    }
+
+    if (state->lastsynctype == 14 || state->lastsynctype == 15 || state->lastsynctype == 37 || state->lastsynctype == 38) //EDACS Calls
+    {
+      source_id = 0;
+      if (opts->p25_is_tuned == 1)
+        source_id = state->lastsrc;
+    }
+
+  }
+
+  //call alert beep when new call detected
+  if (last_source_id == 0 && source_id != 0 && opts->call_alert == 1)
+    beeper (opts, state, slot, 40, 86, 3);
+  
+  if (source_id != last_source_id && last_source_id != 0)
+  {
+
+    if (opts->event_out_file[0] != 0)
+      write_event_to_log_file(opts, state, slot, swrite, event_struct->Event_History_Items[0].event_string);
+
+    event_struct->Event_History_Items[0].write = 1; //written, or pushed at this point
+
+    if (opts->static_wav_file == 0)
+    {
+
+      if (slot == 0 && opts->wav_out_f != NULL)
+      {
+        opts->wav_out_f = close_and_rename_wav_file(opts->wav_out_f, opts->wav_out_file, opts->wav_out_dir, event_struct);
+        opts->wav_out_f = open_wav_file(opts->wav_out_dir, opts->wav_out_file, 8000, 0);
+      }
+        
+      else if (slot == 1 && opts->wav_out_fR != NULL)
+      {
+        opts->wav_out_fR = close_and_rename_wav_file(opts->wav_out_fR, opts->wav_out_fileR, opts->wav_out_dir, event_struct);
+        opts->wav_out_fR = open_wav_file(opts->wav_out_dir, opts->wav_out_fileR, 8000, 0);
+      }
+
+    }
+      
+    push_event_history (event_struct);
+    init_event_history (event_struct, 0, 1);
+
+    //clear out some strings and things
+    memset(state->ysf_txt, 0, sizeof(state->ysf_txt));
+    memset(state->dstar_gps, 0, sizeof(state->dstar_gps));
+    memset(state->dstar_txt, 0, sizeof(state->dstar_txt));
+    state->gi[slot] = -1; //return to an unset value
+
+    //end of voice call alert
+    if (opts->call_alert == 1)
+      beeper (opts, state, slot, 40, 86, 3);
+  }
+
+}
+
+//similar to above, but constantly testing and checking the most recent event only
+//this will hopefully be more useful when dealing with an ongoing event with 
+//features that update over time with embedded signalling, etc
+void watchdog_event_current (dsd_opts * opts, dsd_state * state, uint8_t slot)
+{
+
+  //create a pointer to the current slot event history
+  Event_History_I * event_struct = &state->event_history_s[slot];
+
+  //ncurses color pairs
+  uint8_t color_pair = 4; //default voice color (unknown gi)
+  if (state->gi[slot] == 1)
+    color_pair = 4; //default private voice color
+  else if (state->gi[slot] == 0)
+    color_pair = 4; //default group voice color
+
+  //TODO: Flesh out more later on.
+  uint32_t source_id = 0;
+  uint32_t target_id = 0;
+  char src_str[200]; memset (src_str, 0, sizeof(src_str));
+  sprintf (src_str, "%s", "BUMBLEBEETUNA");
+  char tgt_str[200]; memset (tgt_str, 0, sizeof(tgt_str));
+  sprintf (tgt_str, "%s", "BUMBLEBEETUNA");
+
+  //group import items
+  char t_name[200]; memset (t_name, 0, sizeof(t_name));
+  sprintf (t_name, "%s", "BUMBLEBEETUNA");
+  char s_name[200]; memset (s_name, 0, sizeof(s_name));
+  sprintf (s_name, "%s", "BUMBLEBEETUNA");
+  char t_mode[200]; memset (t_mode, 0, sizeof(t_mode));
+  sprintf (t_mode, "%s", "BUMBLEBEETUNA");
+  char s_mode[200]; memset (s_mode, 0, sizeof(s_mode));
+  sprintf (s_mode, "%s", "BUMBLEBEETUNA");
+
+  uint16_t svc_opts = 0;
+  uint8_t  subtype = 0;
+  uint8_t  mfid = 0;
+  uint32_t sys_id1 = 0;
+  uint32_t sys_id2 = 0;
+  uint32_t sys_id3 = 0;
+  uint32_t sys_id4 = 0;
+  uint32_t sys_id5 = 0;
+
+  uint32_t channel = 0;
+
+  uint8_t  enc    = 0;
+  uint8_t  alg_id = 0;
+  uint16_t key_id = 0;
+  unsigned long long int mi;
+
+  char sysid_string[200]; memset(sysid_string, 0, sizeof(sysid_string));
+  sprintf (sysid_string, "%s", "");
+
+  if (slot == 0)
+  {
+    source_id = state->lastsrc;
+    target_id = state->lasttg;
+    
+    subtype = state->dmrburstL;
+    mfid = state->dmr_fid;
+    
+    svc_opts = state->dmr_so;
+    enc = (svc_opts >> 6) & 1;
+    alg_id = state->payload_algid;
+    key_id = (uint16_t)state->payload_keyid;
+
+    mi = state->payload_mi;
+  }
+  else
+  {
+    source_id = state->lastsrcR;
+    target_id = state->lasttgR;
+
+    subtype = state->dmrburstR;
+    mfid = state->dmr_fidR;
+
+    svc_opts = state->dmr_soR;
+    enc = (svc_opts >> 6) & 1;
+
+    alg_id = state->payload_algidR;
+    key_id = (uint16_t)state->payload_keyidR;
+    mi = state->payload_miR;
+  }
+
+  //if P25 (if not P25, then these will all be zero anyways)
+  sys_id1 = state->p2_wacn;
+  sys_id2 = state->p2_sysid;
+  if (state->nac != 0)
+    sys_id3 = state->nac; //same as state->p2_cc, but zeroes out when no signal or error
+  else sys_id3 = state->p2_cc;
+  sys_id4 = state->p2_rfssid;
+  sys_id5 = state->p2_siteid;
+
+  if (sys_id1)
+    sprintf (sysid_string, "P25_%05X%03X%03X_%d_%d", sys_id1, sys_id2, sys_id3, sys_id4, sys_id5);
+  else sprintf (sysid_string, "P25_%03X", sys_id3);
+
+  if (state->lastsynctype == 10 || state->lastsynctype == 11 || state->lastsynctype == 12 || state->lastsynctype == 13 ||
+     state->lastsynctype == 32 || state->lastsynctype == 33 || state->lastsynctype == 34                                  )
+  {
+    sys_id1 = state->dmr_t3_syscode;
+    sys_id2 = state->dmr_color_code;
+
+    if (sys_id1)
+      sprintf (sysid_string, "DMR_%X_CC_%d", sys_id1, sys_id2);
+    else sprintf (sysid_string, "DMR_CC_%d", sys_id2);
+  }
+
+  if (slot == 0) //BUGFIX: generic catch on FDMA systems so that we don't write duplicate data to slot 2 event history
+  {
+    //NXDN RID (TODO: Changeover to lastsrc and lasttg later on)
+    if (state->lastsynctype == 28 || state->lastsynctype == 29)
+    {
+      source_id = state->nxdn_last_rid;
+      target_id = state->nxdn_last_tg;
+      if (state->nxdn_cipher_type != 0)
+        enc = 1;
+      alg_id = state->nxdn_cipher_type;
+      key_id = state->nxdn_key;
+
+      sys_id1 = state->nxdn_location_site_code;
+      sys_id2 = state->nxdn_location_sys_code;
+      sys_id3 = state->nxdn_last_ran; //might be an issue on conventional systems that have a different RAN on the tx_rel or idle data bursts
+
+      if (sys_id1)
+        sprintf (sysid_string, "NXDN_%d_%d_RAN_%d", sys_id2, sys_id1, sys_id3);
+      else sprintf (sysid_string, "NXDN_RAN_%d", sys_id3);
+    }
+
+    if (state->lastsynctype == 30 || state->lastsynctype == 31) //YSF Fusion
+    {
+      source_id = 0;
+      if (strncmp(state->ysf_src, "          ", 10) != 0) //if this field does not have ten spaces in it
+      {
+        for (uint8_t i = 0; i < 11; i++)
+          source_id += state->ysf_src[i]; //convert to sum value to make a distinct enough src value
+      }
+
+      //WIP: If Text, compile it here (still having issues with an empty txt string making a line break)
+      uint8_t k = 0; char ysf_emp[21][21]; memset(ysf_emp, 0, sizeof(ysf_emp));
+      if (memcmp(ysf_emp, state->ysf_txt, sizeof(state->ysf_txt)) != 0)
+      {
+        for (uint8_t i = 4; i < 8; i++)
+        {
+          for (uint8_t j = 0; j < 20; j++)
+          {
+            if (state->ysf_txt[i][j] != 0x2A)
+              event_struct->Event_History_Items[0].text_message[k++] = state->ysf_txt[i][j];
+            else event_struct->Event_History_Items[0].text_message[k++] = 0x20; //space
+
+          }
+          event_struct->Event_History_Items[0].text_message[k] = 0; //terminate
+        }
+      }
+      else sprintf (event_struct->Event_History_Items[0].text_message, "%s", "BUMBLEBEETUNA");
+
+      sprintf (sysid_string, "%s", "YSF");
+
+      char temp_str[20];
+      memset(temp_str, 0, sizeof(temp_str));
+
+      //set src string as a non-spaced non-garbo char string
+      for (uint8_t i = 0; i < 10; i++)
+      {
+        if (state->ysf_src[i] == 0x20) //spaces to underscore
+          temp_str[i] = 0x5F;
+        else if (state->ysf_src[i] > 0x20 && state->ysf_src[i] < 0x7F) //copy normal ascii range characters
+          temp_str[i] = state->ysf_src[i];
+        else if (state->ysf_src[i] == 0) break; //hit the terminator, so stop
+        else temp_str[i] = 0x5F; //unknown to underscore
+      }
+      sprintf (src_str, "%s", temp_str);
+
+      //same for tgt str
+      memset(temp_str, 0, sizeof(temp_str));
+      for (uint8_t i = 0; i < 10; i++)
+      {
+        if (state->ysf_tgt[i] == 0x20) //spaces to underscore
+          temp_str[i] = 0x5F;
+        else if (state->ysf_tgt[i] > 0x20 && state->ysf_tgt[i] < 0x7F) //copy normal ascii range characters
+          temp_str[i] = state->ysf_tgt[i];
+        else if (state->ysf_tgt[i] == 0) break; //hit the terminator, so stop
+        else temp_str[i] = 0x5F; //unknown to underscore
+      }
+      sprintf (tgt_str, "%s", temp_str);
+
+    }
+
+    if (state->lastsynctype == 8 || state->lastsynctype == 9 || state->lastsynctype == 16 || state->lastsynctype == 17) //M17 STR
+    {
+      target_id = (uint32_t)state->m17_dst;
+      source_id = (uint32_t)state->m17_src;
+      sys_id1 = state->m17_can;
+      sprintf (sysid_string, "M17_CAN_%d", sys_id1);
+      sprintf (src_str, "%s", state->m17_src_csd);
+      sprintf (tgt_str, "%s", state->m17_dst_csd);
+    }
+
+    if (state->lastsynctype == 6 || state->lastsynctype == 7 || state->lastsynctype == 18 || state->lastsynctype == 19) //DSTAR
+    {
+      source_id = 0;
+      for (uint8_t i = 0; i < 12; i++)
+        source_id += state->dstar_src[i]; //convert to sum value to make a distinct enough src value
+
+      //need a strncmp here for 8 spaces in this field first so we don't blip a blank into the event history
+      if (strncmp(state->dstar_src, "        ", 8) == 0)
+        source_id = 0;
+
+      sprintf (sysid_string, "%s", "DSTAR");
+
+      char temp_str[20];
+      memset(temp_str, 0, sizeof(temp_str));
+
+      //set src string as a non-spaced non-garbo char string
+      for (uint8_t i = 0; i < 12; i++)
+      {
+        if (state->dstar_src[i] == 0x20) //spaces to underscore
+          temp_str[i] = 0x5F;
+        else if (state->dstar_src[i] > 0x20 && state->dstar_src[i] < 0x7F) //copy normal ascii range characters
+          temp_str[i] = state->dstar_src[i];
+        else if (state->dstar_src[i] == 0) break; //hit the terminator, so stop
+        else temp_str[i] = 0x5F; //unknown to underscore
+      }
+      sprintf (src_str, "%s", temp_str);
+
+      //same for tgt str
+      memset(temp_str, 0, sizeof(temp_str));
+      for (uint8_t i = 0; i < 8; i++)
+      {
+        if (state->dstar_dst[i] == 0x20) //spaces to underscore
+          temp_str[i] = 0x5F;
+        else if (state->dstar_dst[i] > 0x20 && state->dstar_dst[i] < 0x7F) //copy normal ascii range characters
+          temp_str[i] = state->dstar_dst[i];
+        else if (state->dstar_dst[i] == 0) break; //hit the terminator, so stop
+        else temp_str[i] = 0x5F; //unknown to underscore
+      }
+      sprintf (tgt_str, "%s", temp_str);
+    }
+
+    if (state->lastsynctype == 20 || state->lastsynctype == 24 || state->lastsynctype == 21 || state->lastsynctype == 25 || state->lastsynctype == 22 || state->lastsynctype == 26 || state->lastsynctype == 23 || state->lastsynctype == 27) //dPMR
+    {
+      source_id = 0;
+      for (uint8_t i = 0; i < 20; i++)
+        source_id += state->dpmr_caller_id[i]; //convert to sum value to make a distinct enough src value
+
+      //need a strncmp here for 8 spaces in this field first so we don't blip a blank into the event history
+      if (strncmp(state->dpmr_caller_id, "      ", 6) == 0)
+        source_id = 0;
+
+      sprintf (sysid_string, "DPMR_CC_%d", state->dpmr_color_code);
+
+      sprintf (src_str, "%s", state->dpmr_caller_id);
+      sprintf (tgt_str, "%s", state->dpmr_target_id);
+    }
+
+    if (state->lastsynctype == 14 || state->lastsynctype == 15 || state->lastsynctype == 37 || state->lastsynctype == 38) //EDACS Calls
+    {
+      source_id = 0;
+      if (opts->p25_is_tuned == 1)
+      {
+        source_id = state->lastsrc;
+        channel = state->edacs_tuned_lcn;
+      }
+
+      sys_id1 = state->edacs_site_id;
+      sys_id2 = state->edacs_area_code;
+      sys_id3 = state->edacs_sys_id;
+      svc_opts = state->edacs_vc_call_type;
+      char sup_str[200]; memset (sup_str, 0, sizeof(sup_str));
+      sprintf (sup_str, "%s", "_");
+      if (svc_opts & 0x02)
+        strcat (sup_str, "Digital_");
+      else strcat (sup_str, "Analog_");
+      if (svc_opts & 0x04)
+        strcat (sup_str, "Emergency_");
+      if (svc_opts & 0x08)
+        strcat (sup_str, "Group_");
+      if (svc_opts & 0x10)
+        strcat (sup_str, "I_");
+      if (svc_opts & 0x20)
+        strcat (sup_str, "ALL_");
+      if (svc_opts & 0x40)
+        strcat (sup_str, "INTER_");
+      if (svc_opts & 0x80)
+        strcat (sup_str, "TEST_");
+      if (svc_opts & 0x100)
+        strcat (sup_str, "AGENCY_");
+      if (svc_opts & 0x200)
+        strcat (sup_str, "FLEET_");
+      if (svc_opts & 0x01)
+        strcat (sup_str, "Voice_");
+      strcat (sup_str, "Call");
+      
+      sprintf (sysid_string, "EDACS_SITE_%03d", sys_id1);
+      strcat (sysid_string, sup_str);
+
+      if (state->ea_mode == 0)
+      {
+        int afs = state->lasttg;
+        sprintf(src_str, "%s", ""); sprintf(tgt_str, "%s", "");
+        int a = (afs >> state->edacs_a_shift) & state->edacs_a_mask;
+        int f = (afs >> state->edacs_f_shift) & state->edacs_f_mask;
+        int s = afs & state->edacs_s_mask;
+        sprintf (tgt_str, "%03d_AFS_%02d_%02d%01d", afs, a, f, s);
+        if (state->lastsrc != 0x800 && state->lastsrc != 0)
+          sprintf (src_str, "LID_%d", state->lastsrc);
+        else sprintf (src_str, "LID_UNK");
+      }
+      
+    }
+
+  }
+
+  //if we have a group_array import, search and load it here
+  //will search and load both target values, and src values if available
+  uint8_t t_name_loaded = 0;
+  uint8_t s_name_loaded = 0;
+  if (target_id != 0)
+  {
+    for (int i = 0; i < state->group_tally; i++)
+    {
+      if (state->group_array[i].groupNumber == target_id)
+      {
+        sprintf (t_name, "%s", state->group_array[i].groupName);
+        sprintf (t_mode, "%s", state->group_array[i].groupMode);
+        t_name_loaded = 1;
+        break;
+      }
+    }
+  }
+
+  if (source_id != 0) //&& state->gi[slot] == 1
+  {
+    for (int i = 0; i < state->group_tally; i++)
+    {
+      if (state->group_array[i].groupNumber == source_id)
+      {
+        sprintf (s_name, "%s", state->group_array[i].groupName);
+        sprintf (s_mode, "%s", state->group_array[i].groupMode);
+        s_name_loaded = 1;
+        break;
+      }
+    }
+  }
+
+  //system type string (P25, DMR, etc)
+  const char * sys_string = "Digital";
+  if (state->lastsynctype != -1)
+    sys_string = SyncTypes[state->lastsynctype];
+  
+  //date and time strings
+  char * timestr = getTimeN(time(NULL));
+  char * datestr = getDateN(time(NULL));
+
+  if (source_id != 0)
+  {
+    event_struct->Event_History_Items[0].write = 0;
+    state->event_history_s[slot].Event_History_Items[0].color_pair = color_pair;
+    if (state->lastsynctype != -1)
+      event_struct->Event_History_Items[0].systype = state->lastsynctype;
+    else event_struct->Event_History_Items[0].systype = 39; //generic digital call
+    event_struct->Event_History_Items[0].subtype = subtype; //voice
+    event_struct->Event_History_Items[0].gi = state->gi[slot]; //need this add this to link control messages
+    event_struct->Event_History_Items[0].sys_id1 = sys_id1;
+    event_struct->Event_History_Items[0].sys_id2 = sys_id2;
+    event_struct->Event_History_Items[0].sys_id3 = sys_id3;
+    event_struct->Event_History_Items[0].sys_id4 = sys_id4;
+    event_struct->Event_History_Items[0].sys_id5 = sys_id5;
+    event_struct->Event_History_Items[0].enc = enc;
+    event_struct->Event_History_Items[0].enc_alg = alg_id;
+    event_struct->Event_History_Items[0].enc_key = key_id;
+    event_struct->Event_History_Items[0].mi = mi;
+    event_struct->Event_History_Items[0].svc = svc_opts;
+    event_struct->Event_History_Items[0].source_id = source_id;
+    event_struct->Event_History_Items[0].target_id = target_id;
+    event_struct->Event_History_Items[0].channel = channel; //need to add this to trunking messages, if tuned from call grant
+    if (opts->playfiles == 0) //if playing back .mbe files with a time in it, don't set this
+      event_struct->Event_History_Items[0].event_time = time(NULL);
+    sprintf (event_struct->Event_History_Items[0].sysid_string, "%s", sysid_string);
+    sprintf (event_struct->Event_History_Items[0].src_str, "%s", src_str);
+    sprintf (event_struct->Event_History_Items[0].tgt_str, "%s", tgt_str);
+
+    sprintf (event_struct->Event_History_Items[0].t_name, "%s", t_name);
+    sprintf (event_struct->Event_History_Items[0].s_name, "%s", s_name);
+    sprintf (event_struct->Event_History_Items[0].t_mode, "%s", t_mode);
+    sprintf (event_struct->Event_History_Items[0].s_mode, "%s", s_mode);
+    
+  }
+
+  //Craft an event string for ncurses event history, and a more complex string for logging
+  char event_string[2000]; memset(event_string, 0, sizeof(event_string));
+
+  //WIP: Seperate Voice Call Event Strings when SRC/TGT values are numerical,
+  //and a seperate one for when they are string values (M17, YSF, DSTAR, and dPMR, or use special formatting)
+  if (state->lastsynctype == 30 || state->lastsynctype == 31) //YSF Fusion //TODO: Data calls dumping a lot of events as VOICE
+  {
+    //TODO: See if we can add some decoded data as well in the future to an event string
+    sprintf (event_string, "%s %s %s TGT: %s SRC: %s ", datestr, timestr, sys_string, state->ysf_tgt, state->ysf_src);
+  }
+  else if (state->lastsynctype == 16 || state->lastsynctype == 17) //M17
+  {
+    //TODO: See if we can add some decoded data as well in the future to an event string
+    if (state->m17_dst == 0xFFFFFFFFFFFF)
+      sprintf (event_string, "%s %s %s TGT: %s SRC: %s CAN: %02d;", datestr, timestr, sys_string, "BROADCAST", state->m17_src_str, state->m17_can);
+    else
+      sprintf (event_string, "%s %s %s TGT: %s SRC: %s CAN: %02d;", datestr, timestr, sys_string, state->m17_dst_str, state->m17_src_str, state->m17_can);
+  }
+  else if (state->lastsynctype == 6 || state->lastsynctype == 7 || state->lastsynctype == 18 || state->lastsynctype == 19) //DSTAR
+  {
+    //TODO: See if we can add some decoded data as well in the future to an event string
+    sprintf (event_string, "%s %s %s TGT: %s SRC: %s ", datestr, timestr, sys_string, state->dstar_dst, state->dstar_src);
+  }
+  else if (state->lastsynctype == 20 || state->lastsynctype == 24 || state->lastsynctype == 21 || state->lastsynctype == 25 || state->lastsynctype == 22 || state->lastsynctype == 26 || state->lastsynctype == 23 || state->lastsynctype == 27) //dPMR
+  {
+    //TODO: See if we can add some decoded data as well in the future to an event string
+    sprintf (event_string, "%s %s %s CC: %02d; TGT: %s; SRC: %s; ", datestr, timestr, sys_string, state->dpmr_color_code, state->dpmr_target_id, state->dpmr_caller_id);
+    if (state->dPMRVoiceFS2Frame.Version[0] == 3)
+      strcat (event_string, "Scrambler Enc; ");
+  }
+  else if (state->lastsynctype == 14 || state->lastsynctype == 15 || state->lastsynctype == 37 || state->lastsynctype == 38) //EDACS Calls
+  {
+    svc_opts = state->edacs_vc_call_type;
+    char sup_str[200]; memset (sup_str, 0, sizeof(sup_str));
+    sprintf (sup_str, "%s", "");
+    if (svc_opts & 0x02)
+      strcat (sup_str, "Digital ");
+    else strcat (sup_str, "Analog ");
+    if (svc_opts & 0x04)
+      strcat (sup_str, "Emergency ");
+    if (svc_opts & 0x08)
+      strcat (sup_str, "Group ");
+    if (svc_opts & 0x10)
+      strcat (sup_str, "I ");
+    if (svc_opts & 0x20)
+      strcat (sup_str, "ALL ");
+    if (svc_opts & 0x40)
+      strcat (sup_str, "INTER ");
+    if (svc_opts & 0x80)
+      strcat (sup_str, "TEST ");
+    if (svc_opts & 0x100)
+      strcat (sup_str, "AGENCY ");
+    if (svc_opts & 0x200)
+      strcat (sup_str, "FLEET ");
+    if (svc_opts & 0x01)
+      strcat (sup_str, "Voice ");
+    strcat (sup_str, "Call");
+
+    if (state->ea_mode == 1)
+    {
+      sprintf (event_string, "%s %s %s TGT: %07d; SRC: %07d; LCN: %02d; SITE: %d:%d.%04X; %s; ", datestr, timestr, sys_string, target_id, source_id, channel, sys_id1, sys_id2, sys_id3, sup_str);
+    }
+    else
+    {
+      int afs = state->lasttg;
+      int a = (afs >> state->edacs_a_shift) & state->edacs_a_mask;
+      int f = (afs >> state->edacs_f_shift) & state->edacs_f_mask;
+      int s = afs & state->edacs_s_mask;
+      char afs_str[8];
+      getAfsString(state, afs_str, a, f, s);
+      char lid_str[20]; memset(lid_str, 0, sizeof(lid_str));
+      sprintf(lid_str, "%s", "");
+      if (state->lastsrc != 0 && state->lastsrc != 0x800)
+        sprintf (lid_str, "LID: %05d;", state->lastsrc);
+      else sprintf (lid_str, "LID: __UNK;");
+
+      sprintf (event_string, "%s %s %s AFS: %s (%04d); %s LCN: %02d; Site: %d; %s; ", datestr, timestr, sys_string, afs_str, afs, lid_str, channel, sys_id1, sup_str);
+    }
+  }
+  else if (state->lastsynctype == 10 || state->lastsynctype == 11 || state->lastsynctype == 12 || state->lastsynctype == 13 ||
+     state->lastsynctype == 32 || state->lastsynctype == 33 || state->lastsynctype == 34                                  ) //DMR
+  {
+    if (sys_id1)
+      sprintf (event_string, "%s %s %s TGT: %08d; SRC: %08d; CC: %02d; SYS: %X; ", datestr, timestr, sys_string, target_id, source_id, sys_id2, sys_id1);
+    else
+      sprintf (event_string, "%s %s %s TGT: %08d; SRC: %08d; CC: %02d; ", datestr, timestr, sys_string, target_id, source_id, sys_id2);
+    if (enc)
+      strcat(event_string, "ENC; ");
+    if (alg_id != 0)
+    {
+      char ess_str[30];
+      sprintf (ess_str, "ALG: %02X; KID: %02X; ", alg_id, key_id);
+      strcat(event_string, ess_str);
+    }
+
+    //monitor for misc link control that may set a SO without having SO inside of it,
+    //those could cause misc issues here, will need to observe and make adjustments
+    if (svc_opts & 0x80)
+        strcat (event_string, "Emergency; ");
+
+    if (svc_opts & 0x08)
+      strcat (event_string, "Broadcast; ");
+
+    if (svc_opts & 0x04)
+      strcat (event_string, "OVCM; ");
+
+    if (state->gi[slot] == 0)
+      strcat (event_string, "Group; ");
+    else if (state->gi[slot] == 1)
+      strcat (event_string, "Private; ");
+
+    if (mfid == 0x10)
+    {
+      if (svc_opts & 0x20)
+        strcat (event_string, "TXI; ");
+      else if (svc_opts & 0x10)
+        strcat (event_string, "TXI; "); //this is the svc opt bit that tells you when the next VC6 will be pre-empted, but not helpful here
+
+      if (svc_opts & 0x03)
+        strcat (event_string, "PRIORITY; "); //need to break this apart into each one, but need to double check the decoded value is accurate
+    }
+    
+  }
+  else if (state->lastsynctype == 0 || state->lastsynctype == 1 || state->lastsynctype == 35 || state->lastsynctype == 36)
+  {
+    if (sys_id1)
+      sprintf (event_string, "%s %s %s TGT: %08d; SRC: %08d; NAC: %03X; NET_STS: %05X:%03X:%d.%d; ", datestr, timestr, sys_string, target_id, source_id, sys_id3, sys_id1, sys_id2, sys_id4, sys_id5);
+    else
+      sprintf (event_string, "%s %s %s TGT: %08d; SRC: %08d; NAC: %03X; ", datestr, timestr, sys_string, target_id, source_id, sys_id3);
+    if (alg_id != 0 && alg_id != 0x80)
+    {
+      char ess_str[30];
+      sprintf (ess_str, "ENC; ALG: %02X; KID: %04X; ", alg_id, key_id);
+      strcat(event_string, ess_str);
+    }
+    if (svc_opts & 0x80)
+      strcat (event_string, "Emergency; ");
+    if (state->gi[slot] == 0)
+      strcat (event_string, "Group; ");
+    else if (state->gi[slot] == 1)
+      strcat (event_string, "Private; ");
+  }
+
+  else if (state->lastsynctype == 28 || state->lastsynctype == 29)
+  {
+    if (sys_id1)
+      sprintf (event_string, "%s %s %s TGT: %08d; SRC: %08d; RAN: %02d; SYS: %d.%d; ", datestr, timestr, sys_string, target_id, source_id, sys_id3, sys_id2, sys_id1);
+    else
+      sprintf (event_string, "%s %s %s TGT: %08d; SRC: %08d; RAN: %02d; ", datestr, timestr, sys_string, target_id, source_id, sys_id3);
+    if (enc)
+      strcat(event_string, "ENC; ");
+    if (alg_id != 0)
+    {
+      char ess_str[30];
+      sprintf (ess_str, "ALG: %d; KID: %02X; ", alg_id, key_id);
+      strcat(event_string, ess_str);
+    }
+    if (state->gi[slot] == 0)
+      strcat (event_string, "Group; ");
+    else if (state->gi[slot] == 1)
+      strcat (event_string, "Private; ");
+  }
+
+  if (t_name_loaded)
+  {
+    char group[420];
+    sprintf (group, "TName: %s; Mode: %s; ", t_name, t_mode);
+    strcat (event_string, group);
+  }
+  if (s_name_loaded)
+  {
+    char private[420];
+    sprintf (private, "SName: %s; Mode: %s; ", s_name, s_mode);
+    strcat (event_string, private);
+  }
+
+  sprintf (event_struct->Event_History_Items[0].event_string, "%s", event_string);
+
+  if (timestr != NULL)
+  {
+    free (timestr);
+    timestr = NULL;
+  }
+  if (datestr != NULL)
+  {
+    free (datestr);
+    datestr = NULL;
+  }
+}
+
+void watchdog_event_datacall (dsd_opts * opts, dsd_state * state, uint32_t src, uint32_t dst, char * data_string, uint8_t slot)
+{
+  UNUSED(opts);
+  state->event_history_s[slot].Event_History_Items[0].write = 0;
+  if (state->event_history_s[slot].Event_History_Items[0].color_pair == 4) //if not set previously by specific decoder //don't touch this one
+    state->event_history_s[slot].Event_History_Items[0].color_pair = 4; //default data color //you can change this one
+  state->event_history_s[slot].Event_History_Items[0].systype = state->lastsynctype;
+  state->event_history_s[slot].Event_History_Items[0].subtype = 6; //data
+  state->event_history_s[slot].Event_History_Items[0].gi = state->gi[slot];
+  state->event_history_s[slot].Event_History_Items[0].enc = 0;
+  state->event_history_s[slot].Event_History_Items[0].enc_alg = 0;
+  state->event_history_s[slot].Event_History_Items[0].enc_key = 0;
+  state->event_history_s[slot].Event_History_Items[0].mi = 0;
+  state->event_history_s[slot].Event_History_Items[0].svc = 0;
+  state->event_history_s[slot].Event_History_Items[0].source_id = src;
+  state->event_history_s[slot].Event_History_Items[0].target_id = dst;
+  state->event_history_s[slot].Event_History_Items[0].channel = 0;
+  state->event_history_s[slot].Event_History_Items[0].event_time = time(NULL);
+
+  //date and time strings //getTimeN(time(NULL)); //getDateN(time(NULL));
+  char * timestr = getTimeN(time(NULL));
+  char * datestr = getDateN(time(NULL));
+
+  char event_string[2000]; memset (event_string, 0, sizeof(event_string));
+  sprintf (event_string, "%s %s ", datestr, timestr);
+  strcat (event_string, data_string); //may need to check for potential overflow of this
+  sprintf (state->event_history_s[slot].Event_History_Items[0].event_string, "%s", event_string); //could change this to a strncpy to prevent potential overflow
+
+  if (timestr != NULL)
+  {
+    free (timestr);
+    timestr = NULL;
+  }
+  if (datestr != NULL)
+  {
+    free (datestr);
+    datestr = NULL;
+  }
+
+  //call alert on data calls
+  if (opts->call_alert)
+    beeper (opts, state, slot, 80, 20, 3);
+}
--- a/src/dsd_file.c
+++ b/src/dsd_file.c
--- a/src/dsd_filters.c
+++ b/src/dsd_filters.c
@@ -1,7 +1,7 @@
 #include "dsd.h"

 //M17 Filter -- RRC Alpha = 0.5 S/s 48000 with 81 taps
-#define M17ZEROS 80 
+#define M17ZEROS 80
 float m17gain = 3.16227766f; //sqrt of 10.0f
 static float m17xv[81];

@@ -64,7 +64,7 @@ float xcoeffs[61] =
 //reverted to original NXDN filters, do better with LICH/Data handling
 // NXDN48 filter - Original Version
 #define NXZEROS 134
-float nxgain = 15.95930463f; 
+float nxgain = 15.95930463f;
 static float nxv[NXZEROS+1];

 float nxcoeffs[135] =
@@ -115,17 +115,17 @@ static float dxv[DMRNZEROS+1];

 // DMR filter F4EXB - root raised cosine alpha=0.7 Ts = 6650 S/s Fc = 48kHz
 const float dmrcoeffs[61] =
-{0.0301506278, 0.0269200615, 0.0159662432, -0.0013114705, -0.0216605133, 
-0.0404938748, -0.0528141756, -0.0543747957, -0.0428325003, -0.0186176083, 
-0.0147202645, 0.0508418571, 0.0816392577, 0.0988113688, 0.0957187780, 
-0.0691512084, 0.0206194642, -0.0431564563, -0.1107569268, -0.1675773224, 
-0.1981519842, -0.1889130786, -0.1308939560, -0.0218608492, 0.1325685970, 
-0.3190962499, 0.5182530574, 0.7070497652, 0.8623526878, 0.9644213921, 
-1.0000000000, 0.9644213921, 0.8623526878, 0.7070497652, 0.5182530574, 
-0.3190962499, 0.1325685970, -0.0218608492, -0.1308939560, -0.1889130786, 
-0.1981519842, -0.1675773224, -0.1107569268, -0.0431564563, 0.0206194642, 
-0.0691512084, 0.0957187780, 0.0988113688, 0.0816392577, 0.0508418571, 
-0.0147202645, -0.0186176083, -0.0428325003, -0.0543747957, -0.0528141756, 
+{0.0301506278, 0.0269200615, 0.0159662432, -0.0013114705, -0.0216605133,
+-0.0404938748, -0.0528141756, -0.0543747957, -0.0428325003, -0.0186176083,
+0.0147202645, 0.0508418571, 0.0816392577, 0.0988113688, 0.0957187780,
+0.0691512084, 0.0206194642, -0.0431564563, -0.1107569268, -0.1675773224,
+-0.1981519842, -0.1889130786, -0.1308939560, -0.0218608492, 0.1325685970,
+0.3190962499, 0.5182530574, 0.7070497652, 0.8623526878, 0.9644213921,
+1.0000000000, 0.9644213921, 0.8623526878, 0.7070497652, 0.5182530574,
+0.3190962499, 0.1325685970, -0.0218608492, -0.1308939560, -0.1889130786,
+-0.1981519842, -0.1675773224, -0.1107569268, -0.0431564563, 0.0206194642,
+0.0691512084, 0.0957187780, 0.0988113688, 0.0816392577, 0.0508418571,
+0.0147202645, -0.0186176083, -0.0428325003, -0.0543747957, -0.0528141756,
 -0.0404938748, -0.0216605133, -0.0013114705, 0.0159662432, 0.0269200615, 0.0301506278};

 // dPMR filter, version of F4EXB
@@ -193,7 +193,7 @@ nxdn_filter(short sample)
 short
 dpmr_filter(short sample)
 {
-    return dsd_input_filter(sample, 4); 
+    return dsd_input_filter(sample, 4);
 }

 short m17_filter (short sample)
@@ -245,7 +245,7 @@ dsd_input_filter(short sample, int mode)
    default:
      return sample;
  }
-  
+
  for (i = 0; i < zeros; i++)
      v[i] = v[i+1];

--- a/src/dsd_frame.c
+++ b/src/dsd_frame.c
@@ -26,30 +26,23 @@ void
 printFrameInfo (dsd_opts * opts, dsd_state * state)
 {

-  int level;
+  UNUSED(opts);

-  level = (int) state->max / 164;
-  if (opts->verbose > 0)
-    {
-      // fprintf (stderr,"inlvl: %2i%% ", level);
-      UNUSED(level);
-    }
-  if (state->nac != 0)
-    {
-      fprintf (stderr, "%s", KCYN);
-      fprintf (stderr,"nac: [%4X] ", state->nac);
-      fprintf (stderr, "%s", KNRM);
-    }
+  fprintf (stderr, "%s", KCYN);
+  if (state->p2_wacn != 0)
+    fprintf (stderr, "WACN: %05llX; ", state->p2_wacn);
+  if (state->p2_sysid != 0)
+    fprintf (stderr, "SYS: %03llX; ", state->p2_sysid);
+  if (state->p2_cc != 0)
+    fprintf (stderr, "NAC/CC: %03llX; ", state->p2_cc);
+  else fprintf (stderr, "NAC: %03X; ", state->nac);

-  if (opts->verbose > 1)
-    {
-      fprintf (stderr, "%s", KGRN);
-      fprintf (stderr,"src: [%8i] ", state->lastsrc);
-      fprintf (stderr, "%s", KNRM);
-    }
-  fprintf (stderr, "%s", KGRN);
-  fprintf (stderr,"tg: [%5i] ", state->lasttg);
+  if (state->p2_rfssid != 0)
+    fprintf (stderr, "RFSS: %03lld; ", state->p2_rfssid);
+  if (state->p2_siteid != 0)
+    fprintf (stderr, "Site: %03lld; ", state->p2_siteid);
  fprintf (stderr, "%s", KNRM);
+
 }

 void
@@ -91,7 +84,7 @@ processFrame (dsd_opts * opts, dsd_state * state)
  if ((state->synctype == 28) || (state->synctype == 29))
  {
    //MBEout restored, is not handled internally by nxdn_frame.c
-    nxdn_frame (opts, state); 
+    nxdn_frame (opts, state);
    return;
  }

@@ -121,7 +114,7 @@ processFrame (dsd_opts * opts, dsd_state * state)
      if (state->dmr_mfid == 0x10) ; //sprintf (state->dmr_branding, "%s",  "Motorola");
      else if (state->dmr_mfid == 0x68) sprintf (state->dmr_branding, "%s", "  Hytera");
      else if (state->dmr_mfid == 0x58) sprintf (state->dmr_branding, "%s", "    Tait");
-      
+
      //disabling these due to random data decodes setting an odd mfid, could be legit, but only for that one packet?
      //or, its just a decode error somewhere
      // else if (state->dmr_mfid == 0x20) sprintf (state->dmr_branding, "%s", "JVC Kenwood");
@@ -159,14 +152,14 @@ processFrame (dsd_opts * opts, dsd_state * state)
          sprintf (state->slot1light, " slot1 ");
          sprintf (state->slot2light, " slot2 ");
          //we can safely open MBE on any MS or mono handling
-          if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL)) openMbeOutFile (opts, state); 
-          if (opts->p25_trunk == 0) dmrMSBootstrap (opts, state); 
+          if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL)) openMbeOutFile (opts, state);
+          if (opts->p25_trunk == 0) dmrMSBootstrap (opts, state);
        }
        if (opts->dmr_mono == 1 && state->synctype == 32)
        {
          //we can safely open MBE on any MS or mono handling
          if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL)) openMbeOutFile (opts, state);
-          if (opts->p25_trunk == 0) dmrMSBootstrap (opts, state); 
+          if (opts->p25_trunk == 0) dmrMSBootstrap (opts, state);
        }
        if (opts->dmr_stereo == 1) //opts->dmr_stereo == 1
        {
@@ -258,7 +251,7 @@ processFrame (dsd_opts * opts, dsd_state * state)
    //edacs
    else if ((state->synctype == 37) || (state->synctype == 38))
    {
-      if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state); 
+      if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
      edacs (opts, state);
      return;
    }
@@ -269,21 +262,10 @@ processFrame (dsd_opts * opts, dsd_state * state)
      processYSF(opts, state);
      return;
    }
-    //M17
-    else if ((state->synctype == 16) || (state->synctype == 9)  || (state->synctype == 17) || (state->synctype == 8)  || 
-             (state->synctype == 76) || (state->synctype == 77) || (state->synctype == 86) || (state->synctype == 87) ||
-             (state->synctype == 99) || (state->synctype == 98) )
+    //M17 STR
+    else if (state->synctype == 16)
    {
-      if (state->synctype == 98 || state->synctype == 99) //preamble only
-        skipDibit(opts, state, 8); //skip dibits to prime the demodulator
-      else if (state->synctype == 16 || state->synctype == 17)
-        processM17STR(opts, state);
-      else if (state->synctype == 76 || state->synctype == 77) {} //Not available yet
-      //   processM17BRT(opts, state); //Not available yet
-      else if (state->synctype == 86 || state->synctype == 87)
-        processM17PKT(opts, state);
-      else 
-        processM17LSF(opts, state);
+      processM17STR(opts, state);
      return;
    }
    //P25 P2
@@ -443,7 +425,7 @@ processFrame (dsd_opts * opts, dsd_state * state)
      }
      if (opts->mbe_out_dir[0] != 0)
      {
-        if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state); 
+        if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
        if (opts->mbe_out_f == NULL) openMbeOutFile (opts, state);
      }
      mbe_initMbeParms (state->cur_mp, state->prev_mp, state->prev_mp_enhanced);
--- a/src/dsd_frame_sync.c
+++ b/src/dsd_frame_sync.c
@@ -32,11 +32,11 @@ printFrameSync (dsd_opts * opts, dsd_state * state, char *frametype, int offset,

  //oops, that made a nested if-if-if-if statement,
  //causing a memory leak
-  
+
  // if (opts->verbose > 2)
    //fprintf (stderr,"o: %4i ", offset);
  // if (opts->verbose > 1)
-    //fprintf (stderr,"mod: %s ", modulation); 
+    //fprintf (stderr,"mod: %s ", modulation);
  // if (opts->verbose > 2)
    //fprintf (stderr,"g: %f ", state->aout_gain);

@@ -123,14 +123,14 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
      {
        state->lcn_freq_roll++;
        //check roll again if greater than expected, then go back to zero
-        if (state->lcn_freq_roll >= state->lcn_freq_count) 
+        if (state->lcn_freq_roll >= state->lcn_freq_count)
        {
          state->lcn_freq_roll = 0; //reset to zero
-        } 
+        }
      }
    }
    //check that we have a non zero value first, then tune next frequency
-    if (state->trunk_lcn_freq[state->lcn_freq_roll] != 0) 
+    if (state->trunk_lcn_freq[state->lcn_freq_roll] != 0)
    {
      //rigctl
      if (opts->use_rigctl == 1)
@@ -145,8 +145,8 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
        rtl_dev_tune (opts, state->trunk_lcn_freq[state->lcn_freq_roll]);
        #endif
      }
-      
-      fprintf (stderr, "Tuning to Frequency: %.06lf MHz\n", 
+
+      fprintf (stderr, "Tuning to Frequency: %.06lf MHz\n",
                (double)state->trunk_lcn_freq[state->lcn_freq_roll]/1000000);

    }
@@ -162,7 +162,6 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
  char synctest20[21]; //YSF
  char synctest48[49]; //EDACS
  char synctest8[9];   //M17
-  char synctest16[17]; //M17 Preamble
  char modulation[8];
  char *synctest_p;
  char synctest_buf[10240]; //what actually is assigned to this, can't find its use anywhere?
@@ -206,11 +205,10 @@ getFrameSync (dsd_opts * opts, dsd_state * state)

  // detect frame sync
  t = 0;
-  synctest10[10] = 0; 
+  synctest10[10] = 0;
  synctest[24] = 0;
-  synctest8[8] = 0;   //M17, wasn't initialized or terminated (source of much pain and frustration in Cygwin)
+  synctest8[8] = 0;
  synctest12[12] = 0;
-  synctest16[16] = 0; //M17, wasn't initialized or terminated (source of much pain and frustration in Cygwin)
  synctest48[48] = 0;
  synctest32[32] = 0;
  synctest20[20] = 0;
@@ -224,11 +222,17 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
  lastt = 0;
  state->numflips = 0;

-  //move ncursesPrinter outside of the sync loop, causes weird lag inside the loop
+  //run here as well
  if (opts->use_ncurses_terminal == 1)
-  {
    ncursesPrinter(opts, state);
-  }
+
+  //slot 1
+  watchdog_event_history(opts, state, 0);
+  watchdog_event_current(opts, state, 0);
+
+  //slot 2 for TDMA systems
+  watchdog_event_history(opts, state, 1);
+  watchdog_event_current(opts, state, 1);

  if ((opts->symboltiming == 1) && (state->carrier == 1))
    {
@@ -240,6 +244,11 @@ getFrameSync (dsd_opts * opts, dsd_state * state)

      t++;

+      //run ncurses printer more frequently when no sync to speed up responsiveness of it during no sync period
+      //NOTE: Need to monitor and test this, if responsiveness issues arise, then disable this
+      if ( opts->use_ncurses_terminal == 1 && ((t % 300) == 0)) //t maxes out at 1800 (6 times each getFrameSync)
+        ncursesPrinter(opts, state);
+
      symbol = getSymbol (opts, state, 0);

      lbuf[lidx] = symbol;
@@ -358,20 +367,20 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
          }
        }
      }
-      
+
      state->dmr_payload_p++;
      // end digitize and dmr buffer testing

-      *synctest_p = dibit; 
+      *synctest_p = dibit;
      if (t >= t_max) //works excelent now with short sync patterns, and no issues with large ones!
        {
          for (i = 0; i < t_max; i++) //24
            {
              lbuf2[i] = lbuf[i];
            }
-          qsort (lbuf2, t_max, sizeof (int), comp); 
+          qsort (lbuf2, t_max, sizeof (int), comp);
          lmin = (lbuf2[1] + lbuf2[2] + lbuf2[3]) / 3;
-          lmax = (lbuf2[t_max - 3] + lbuf2[t_max - 2] + lbuf2[t_max - 1]) / 3; 
+          lmax = (lbuf2[t_max - 3] + lbuf2[t_max - 2] + lbuf2[t_max - 1]) / 3;

          if (state->rf_mod == 1)
            {
@@ -432,7 +441,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                  sprintf (state->ftype, "P25 Phase 1");
                  if (opts->errorbars == 1)
                    {
-                      printFrameSync (opts, state, "+P25p1 ", synctest_pos + 1, modulation);
+                      printFrameSync (opts, state, "+P25p1", synctest_pos + 1, modulation);
                    }
                  state->lastsynctype = 0;
                  state->last_cc_sync_time = time(NULL);
@@ -528,7 +537,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
            }
          //YSF sync
          strncpy(synctest20, (synctest_p - 19), 20);
-          if(opts->frame_ysf == 1) 
+          if(opts->frame_ysf == 1)
          {
            if (strcmp(synctest20, FUSION_SYNC) == 0)
            {
@@ -555,142 +564,27 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
          }
          //end YSF sync

-          //M17 Sync -- Just STR and LSF for now
-          strncpy(synctest16, (synctest_p - 15), 16);
+          //M17 Sync -- Just STR
          strncpy(synctest8, (synctest_p - 7), 8);
-          if(opts->frame_m17 == 1) 
+          if(opts->frame_m17 == 1)
          {
-            //preambles will skip dibits in an attempt to prime the 
-            //demodulator but not attempt any decoding
-            if (strcmp(synctest8, M17_PRE) == 0)
+            if (strcmp(synctest8, M17_STR) == 0)
            {
-              if (opts->inverted_m17 == 0)
+              printFrameSync (opts, state, "+M17 STR", synctest_pos + 1, modulation);
+              state->carrier = 1;
+              state->offset = synctest_pos;
+              state->max = ((state->max) + lmax) / 2;
+              state->min = ((state->min) + lmin) / 2;
+              if (state->lastsynctype == 16)
              {
-                printFrameSync (opts, state, "+M17 PREAMBLE", synctest_pos + 1, modulation);
-                state->carrier = 1;
-                state->offset = synctest_pos;
-                state->max = ((state->max) + lmax) / 2;
-                state->min = ((state->min) + lmin) / 2;
-                state->lastsynctype = 98;
-                fprintf (stderr, "\n");
-                return (98);
-              }
-            }
-            else if (strcmp(synctest8, M17_PIV) == 0)
-            {
-              if (opts->inverted_m17 == 1)
-              {
-                printFrameSync (opts, state, "-M17 PREAMBLE", synctest_pos + 1, modulation);
-                state->carrier = 1;
-                state->offset = synctest_pos;
-                state->max = ((state->max) + lmax) / 2;
-                state->min = ((state->min) + lmin) / 2;
-                state->lastsynctype = 99;
-                fprintf (stderr, "\n");
-                return (99);
-              }
-            }
-            else if (strcmp(synctest8, M17_PKT) == 0)
-            {
-              if (opts->inverted_m17 == 0)
-              {
-                printFrameSync (opts, state, "+M17 PKT", synctest_pos + 1, modulation);
-                state->carrier = 1;
-                state->offset = synctest_pos;
-                state->max = ((state->max) + lmax) / 2;
-                state->min = ((state->min) + lmin) / 2;
-                if (state->lastsynctype == 86 || state->lastsynctype == 8)
-                {
-                  state->lastsynctype = 86;
-                  return (86);
-                }
-                state->lastsynctype = 86;
-                fprintf (stderr, "\n");
-              }
-              // else //unknown, -BRT?
-              // {
-              //   printFrameSync (opts, state, "-M17 BRT", synctest_pos + 1, modulation);
-              //   state->carrier = 1;
-              //   state->offset = synctest_pos;
-              //   state->max = ((state->max) + lmax) / 2;
-              //   state->min = ((state->min) + lmin) / 2;
-              //   if (state->lastsynctype == 77)
-              //   {
-              //     state->lastsynctype = 77;
-              //     return (77);
-              //   }
-              //   state->lastsynctype = 77;
-              //   fprintf (stderr, "\n");
-              // }
-            }
-            else if (strcmp(synctest8, M17_STR) == 0)
-            {
-              if (opts->inverted_m17 == 0)
-              {
-                printFrameSync (opts, state, "+M17 STR", synctest_pos + 1, modulation);
-                state->carrier = 1;
-                state->offset = synctest_pos;
-                state->max = ((state->max) + lmax) / 2;
-                state->min = ((state->min) + lmin) / 2;
-                if (state->lastsynctype == 16 || state->lastsynctype == 8)
-                {
-                  state->lastsynctype = 16;
-                  return (16);
-                }
                state->lastsynctype = 16;
-                fprintf (stderr, "\n");
-              }
-              else
-              {
-                printFrameSync (opts, state, "-M17 LSF", synctest_pos + 1, modulation);
-                state->carrier = 1;
-                state->offset = synctest_pos;
-                state->max = ((state->max) + lmax) / 2;
-                state->min = ((state->min) + lmin) / 2;
-                if (state->lastsynctype == 99)
-                {
-                  state->lastsynctype = 9;
-                  return (9);
-                }
-                state->lastsynctype = 9;
-                fprintf (stderr, "\n");
-              }
-            }
-            else if (strcmp(synctest8, M17_LSF) == 0)
-            {
-              if (opts->inverted_m17 == 1)
-              {
-                printFrameSync (opts, state, "-M17 STR", synctest_pos + 1, modulation);
-                state->carrier = 1;
-                state->offset = synctest_pos;
-                state->max = ((state->max) + lmax) / 2;
-                state->min = ((state->min) + lmin) / 2;
-                if (state->lastsynctype == 17 || state->lastsynctype == 9)
-                {
-                  state->lastsynctype = 17;
-                  return (17);
-                }
-                state->lastsynctype = 17;
-                fprintf (stderr, "\n");
-              }
-              else
-              {
-                printFrameSync (opts, state, "+M17 LSF", synctest_pos + 1, modulation);
-                state->carrier = 1;
-                state->offset = synctest_pos;
-                state->max = ((state->max) + lmax) / 2;
-                state->min = ((state->min) + lmin) / 2;
-                if (state->lastsynctype == 98)
-                {
-                  state->lastsynctype = 8;
-                  return (8);
-                }
-                state->lastsynctype = 8;
-                fprintf (stderr, "\n");
+                return (16);
              }
+              state->lastsynctype = 16;
+              fprintf (stderr, "\n");
            }
          }
-          //end M17 
+          //end M17

          //P25 P2 sync S-ISCH VCH
          strncpy(synctest20, (synctest_p - 19), 20);
@@ -708,13 +602,11 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                state->lastsynctype = 35; //35
                if (opts->errorbars == 1)
                {
-                  printFrameSync (opts, state, "+P25p2 SISCH", synctest_pos + 1, modulation);
+                  printFrameSync (opts, state, "+P25p2", synctest_pos + 1, modulation);
                }
                if (state->p2_wacn != 0 && state->p2_cc != 0 && state->p2_sysid != 0)
            		{
-            			//fprintf (stderr, "%s", KCYN);
-            			fprintf (stderr, " WACN [%05llX] SYS [%03llX] NAC [%03llX] ", state->p2_wacn, state->p2_sysid, state->p2_cc);
-            			//fprintf (stderr, "%s", KNRM);
+            			printFrameInfo(opts, state);
            		}
            		else
            		{
@@ -741,13 +633,11 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                opts->inverted_p2 = 1;
                if (opts->errorbars == 1)
                {
-                  printFrameSync (opts, state, "-P25p2 SISCH", synctest_pos + 1, modulation);
+                  printFrameSync (opts, state, "-P25p2", synctest_pos + 1, modulation);
                }
                if (state->p2_wacn != 0 && state->p2_cc != 0 && state->p2_sysid != 0)
            		{
-            			//fprintf (stderr, "%s", KCYN);
-            			fprintf (stderr, " WACN [%05llX] SYS [%03llX] NAC [%03llX] ", state->p2_wacn, state->p2_sysid, state->p2_cc);
-            			//fprintf (stderr, "%s", KNRM);
+            			printFrameInfo(opts, state);
            		}
            		else
            		{
@@ -917,7 +807,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                  printFrameSync (opts, state, "+DMR ", synctest_pos + 1, modulation);
                }
                state->lastsynctype = 10;
-                state->last_cc_sync_time = time(NULL); 
+                state->last_cc_sync_time = time(NULL);
                return (10);
              }
              else
@@ -933,7 +823,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                  state->firstframe = 1;
                }
                state->lastsynctype = 11;
-                state->last_cc_sync_time = time(NULL); 
+                state->last_cc_sync_time = time(NULL);
                return (11); //11
              }
            }
@@ -1032,7 +922,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                  state->firstframe = 1;
                }
                state->lastsynctype = 12;
-                state->last_cc_sync_time = time(NULL); 
+                state->last_cc_sync_time = time(NULL);
                return (12);
              }

@@ -1045,7 +935,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                  printFrameSync (opts, state, "-DMR ", synctest_pos + 1, modulation);
                }
                state->lastsynctype = 13;
-                state->last_cc_sync_time = time(NULL); 
+                state->last_cc_sync_time = time(NULL);
                return (13);
              }
            }
@@ -1164,7 +1054,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
              state->max = ((state->max) + lmax) / 2;
              state->min = ((state->min) + lmin) / 2;
              printFrameSync (opts, state, "-EDACS", synctest_pos + 1, modulation);
-              state->lastsynctype = 38; 
+              state->lastsynctype = 38;
              return (38);
            }
            else if ( strcmp (synctest48, INV_EDACS_SYNC) == 0)
@@ -1175,7 +1065,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
              state->max = ((state->max) + lmax) / 2;
              state->min = ((state->min) + lmin) / 2;
              printFrameSync (opts, state, "+EDACS", synctest_pos + 1, modulation);
-              state->lastsynctype = 37; 
+              state->lastsynctype = 37;
              return (37);
            }
            else if ((strcmp (synctest48, DOTTING_SEQUENCE_A) == 0) || (strcmp (synctest48, DOTTING_SEQUENCE_B) == 0))
@@ -1189,7 +1079,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
            }

          }
-         
+
          else if (opts->frame_dstar == 1)
            {
              if (strcmp (synctest, DSTAR_SYNC) == 0)
@@ -1261,14 +1151,14 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                || (strcmp (synctest10, "3131331111") == 0 )
                || (strcmp (synctest10, "3331331111") == 0 )
                || (strcmp (synctest10, "3131311131") == 0 ) //First few FSW on NXDN48 Type-C seems to hit this for some reason
-                      
+
                )
            {

              state->offset = synctest_pos;
              state->max = ((state->max) + lmax) / 2;
              state->min = ((state->min) + lmin) / 2;
-              if (state->lastsynctype == 28) 
+              if (state->lastsynctype == 28)
              {
                state->last_cc_sync_time = time(NULL);
                return (28);
@@ -1276,21 +1166,21 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
              state->lastsynctype = 28;
            }

-            else if ( 
-                      
+            else if (
+
                       (strcmp (synctest10, "1313113313") == 0 )
                    || (strcmp (synctest10, "1113113313") == 0 )
                    || (strcmp (synctest10, "1313113333") == 0 )
                    || (strcmp (synctest10, "1113113333") == 0 )
                    || (strcmp (synctest10, "1313133313") == 0 )
-                      
+
                    )
            {

              state->offset = synctest_pos;
              state->max = ((state->max) + lmax) / 2;
              state->min = ((state->min) + lmin) / 2;
-              if (state->lastsynctype == 29) 
+              if (state->lastsynctype == 29)
              {
                state->last_cc_sync_time = time(NULL);
                return (29);
@@ -1303,7 +1193,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
          #ifdef PVCONVENTIONAL
          if (opts->frame_provoice == 1)
          {
-            memset (synctest32, 0, sizeof(synctest32)); 
+            memset (synctest32, 0, sizeof(synctest32));
            strncpy (synctest32, (synctest_p - 31), 16); //short sync grab here on 32
            char pvc_txs[9]; //string (symbol) value of TX Address
            char pvc_rxs[9]; //string (symbol) value of RX Address
@@ -1418,18 +1308,18 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
              if ((opts->errorbars == 1) && (opts->verbose > 1) && (state->carrier == 1))
                {
                  fprintf (stderr,"Sync: no sync\n");
-                  // fprintf (stderr,"Press CTRL + C to close.\n"); 
+                  // fprintf (stderr,"Press CTRL + C to close.\n");

                }
              noCarrier (opts, state);

              return (-1);
            }
-        }        
+        }

    }

  return (-1);
-  
+
 }

--- a/src/dsd_gps.c
+++ b/src/dsd_gps.c
@@ -15,6 +15,12 @@ void lip_protocol_decoder (dsd_opts * opts, dsd_state * state, uint8_t * input)

  int slot = state->currentslot;

+  //May need to set this in the UDT header, or pass it into this function to be sure
+  // uint32_t src = 0;
+  // if (slot == 0)
+  //   src = state->lastsrc;
+  // else src = state->lastsrcR;
+
  //NOTE: This format is pretty much the same as DMR EMB GPS, but has a few extra elements,
  //so I got lazy and just lifted most of the code from there, also assuming same lat/lon calcs
  //since those have been tested to work in DMR EMB GPS and units are same in LIP
@@ -54,7 +60,7 @@ void lip_protocol_decoder (dsd_opts * opts, dsd_state * state, uint8_t * input)
    lat = 0x800001 - lat;
    sprintf (latstr, "%s", "S");
    lat_sf = -1.0f;
-  } 
+  }
  latitude = ((double)lat * lat_unit);

  if (lon_sign)
@@ -62,13 +68,13 @@ void lip_protocol_decoder (dsd_opts * opts, dsd_state * state, uint8_t * input)
    lon = 0x1000001 - lon;
    sprintf (lonstr, "%s", "W");
    lon_sf = -1.0f;
-  } 
+  }
  longitude = ((double)lon * lon_unit);

  //6.3.63 Position Error
  //6.3.17 Horizontal velocity
  /*
-    Horizontal velocity shall be encoded for speeds 0 km/h to 28 km/h in 1 km/h steps and 
+    Horizontal velocity shall be encoded for speeds 0 km/h to 28 km/h in 1 km/h steps and
    from 28 km/h onwards using equation: v = C × (1 + x)^(K-A) + B where:
  */
  float v = 0.0f;
@@ -89,12 +95,12 @@ void lip_protocol_decoder (dsd_opts * opts, dsd_state * state, uint8_t * input)
  int dt = (int)dir;

  //sanity check
-  if (abs (latitude) < 90 && abs(longitude) < 180)
+  if (fabs (latitude) < 90 && fabs(longitude) < 180)
  {
    fprintf (stderr, "Src(Hash); %03d;  Lat: %.5lf%s%s Lon: %.5lf%s%s (%.5lf, %.5lf); Spd: %d km/h; Dir: %d%s",add_hash, latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, lat_sf * latitude, lon_sf * longitude, vt, dt, deg_glyph);

    //6.3.63 Position Error
-    uint16_t position_error = 2 * pow(10, pos_err); //2 * 10^pos_err 
+    uint16_t position_error = 2 * pow(10, pos_err); //2 * 10^pos_err
    if (pos_err == 0x7 ) fprintf (stderr, "\n  Position Error: Unknown or Invalid;");
    else fprintf (stderr, "\n  Position Error: Less than %dm;", position_error);

@@ -115,6 +121,9 @@ void lip_protocol_decoder (dsd_opts * opts, dsd_state * state, uint8_t * input)
    }
    else sprintf (state->dmr_embedded_gps[slot], "%03d; LIP: %.5lf%s%s %.5lf%s%s Unknown Pos Err; Spd: %d km/h; Dir %d%s", add_hash, latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, vt, dt, deg_glyph);

+    //save to event history string
+    sprintf (state->event_history_s[slot].Event_History_Items[0].gps_s, "%s", state->dmr_embedded_gps[slot]);
+
    //save to LRRP report for mapping/logging
    FILE * pFile; //file pointer
    if (opts->lrrp_file_output == 1)
@@ -157,7 +166,7 @@ void nmea_iec_61162_1 (dsd_opts * opts, dsd_state * state, uint8_t * input, uint
 {
  int slot = state->currentslot;

-  //NOTE: The Only difference between Short (type == 1) and Long Format (type == 2) 
+  //NOTE: The Only difference between Short (type == 1) and Long Format (type == 2)
  //is the utc_ss3 on short vs utc_ss6 and inclusion of COG value on long

  //NOTE: MFID Specific Formats are not handled here, unknown, could be added if worked out
@@ -184,9 +193,9 @@ void nmea_iec_61162_1 (dsd_opts * opts, dsd_state * state, uint8_t * input, uint
  uint8_t nmea_utc_hh  = (uint8_t)ConvertBitIntoBytes(&input[66], 5);
  uint8_t nmea_utc_mm  = (uint8_t)ConvertBitIntoBytes(&input[71], 6);
  //seconds and the addition of COG is the difference between short and long formats
-  uint8_t nmea_utc_ss3 = (uint8_t)ConvertBitIntoBytes(&input[77], 3); //seconds in 10s
-  uint8_t nmea_utc_ss6 = (uint8_t)ConvertBitIntoBytes(&input[77], 6); //seconds in 1s
-  uint16_t nmea_cog = (uint16_t)ConvertBitIntoBytes(&input[103], 9); //course over ground in degrees
+  uint8_t nmea_utc_ss3 = (uint8_t)ConvertBitIntoBytes(&input[77], 3) * 10; //seconds in 10s
+  uint8_t nmea_utc_ss6 = (uint8_t)ConvertBitIntoBytes(&input[77], 6);     //seconds in 1s
+  uint16_t nmea_cog = (uint16_t)ConvertBitIntoBytes(&input[103], 9);     //course over ground in degrees

  //lat and lon conversion
  char deg_glyph[4];
@@ -230,6 +239,9 @@ void nmea_iec_61162_1 (dsd_opts * opts, dsd_state * state, uint8_t * input, uint
  //save to ncurses string
  sprintf (state->dmr_embedded_gps[slot], "GPS: (%f%s, %f%s)", latitude, deg_glyph, longitude, deg_glyph);

+  //save to event history string
+  sprintf (state->event_history_s[slot].Event_History_Items[0].gps_s, "(%f%s, %f%s)", latitude, deg_glyph, longitude, deg_glyph);
+
  //save to LRRP report for mapping/logging
  FILE * pFile; //file pointer
  if (opts->lrrp_file_output == 1)
@@ -333,16 +345,24 @@ void nmea_harris (dsd_opts * opts, dsd_state * state, uint8_t * input, uint32_t
  if (!nmea_ns) latitude  *= -1.0f; //0 is South, 1 is North
  if (!nmea_ew) longitude *= -1.0f; //0 is West, 1 is East

-  fprintf (stderr, "\n");
+  //is this from LCW, or MAC?
+  uint16_t header = (uint16_t)ConvertBitIntoBytes(&input[0], 16);

-  fprintf (stderr, " VCH: %d - SRC: %08d;", slot, src);
+  fprintf (stderr, "\n");
+  if (header == 0x2AA4)
+    fprintf (stderr, " SRC: %08d;", src);
+  else
+    fprintf (stderr, " VCH: %d - SRC: %08d;", slot, src);
  fprintf (stderr, " GPS: %f%s, %f%s;", latitude, deg_glyph, longitude, deg_glyph);

  //Speed in Knots (assuming in knots, and not in mps, or kph)
-  if (nmea_speed > 126)
-    fprintf (stderr, " SPD > 126 knots or %f MPH;", fmph); //using MPH here, its Harris, they're in the U.S.
-  else
-    fprintf (stderr, " SPD: %d knots; %f MPH;", nmea_speed, fmph);
+  if (header != 0x2AA4) //can't yet verify this is present or accurate on LCW
+  {
+    if (nmea_speed > 126)
+      fprintf (stderr, " SPD > 126 knots or %f MPH;", fmph); //using MPH here, its Harris, they're in the U.S.
+    else
+      fprintf (stderr, " SPD: %d knots; %f MPH;", nmea_speed, fmph);
+  }

  //Course Over Ground (COG)
  fprintf (stderr, " COG: %03d%s;", nmea_cog, deg_glyph); //%360
@@ -361,7 +381,11 @@ void nmea_harris (dsd_opts * opts, dsd_state * state, uint8_t * input, uint32_t
  else fprintf (stderr, " Last Fix;");

  //save to ncurses string
-  sprintf (state->dmr_embedded_gps[slot], "GPS: (%f%s, %f%s)", latitude, deg_glyph, longitude, deg_glyph);
+  sprintf (state->dmr_embedded_gps[slot], "(%f%s, %f%s)", latitude, deg_glyph, longitude, deg_glyph);
+
+  //save to event history string
+  if (state->event_history_s[slot].Event_History_Items[0].source_id == src && src != 0)
+    sprintf (state->event_history_s[slot].Event_History_Items[0].gps_s, "%s", state->dmr_embedded_gps[slot]);

  //save to LRRP report for mapping/logging
  FILE * pFile; //file pointer
@@ -404,7 +428,7 @@ void nmea_harris (dsd_opts * opts, dsd_state * state, uint8_t * input, uint32_t
  //not including the CRC obviously, unsure of their meaning, could relate
  //to other GPS functions like precision, etc, unknown.

-  //NOTE2: All these values are just best effort based on observation and 
+  //NOTE2: All these values are just best effort based on observation and
  //making map points match using logic and distance over time for speed and course
  //without any documentation, any of these values may still be wrong

@@ -419,7 +443,7 @@ void harris_gps(dsd_opts * opts, dsd_state * state, int slot, uint8_t * input)
  uint16_t lat_mmin = 0;
  uint16_t lon_mmin = 0;

-  //potentially in this PDU, but unverifiable without documentation or reasonable 
+  //potentially in this PDU, but unverifiable without documentation or reasonable
  //mathematical proof vs map points and direction of travel / distance over time (assuming the radio is facing that direction)
  uint16_t rspeed = (uint16_t)ConvertBitIntoBytes(&input[136], 8); //MSB //136
  rspeed = (rspeed << 8) + (uint16_t)ConvertBitIntoBytes(&input[128], 8); //LSB //128
@@ -455,7 +479,7 @@ void harris_gps(dsd_opts * opts, dsd_state * state, int slot, uint8_t * input)
  char deg_glyph[4];
  sprintf (deg_glyph, "%s", "°");

-  //This appears to be similar to the NMEA GPGGA format (DDmm.mm) but 
+  //This appears to be similar to the NMEA GPGGA format (DDmm.mm) but
  //octets are ordered in least significant to most significant value
  lat_mmin = (uint16_t)ConvertBitIntoBytes(&input[40], 16); //? bits required, but grabbing two octets
  lat_min  = (uint8_t)ConvertBitIntoBytes(&input[58], 6);  //6 bits required to get 60
@@ -464,7 +488,7 @@ void harris_gps(dsd_opts * opts, dsd_state * state, int slot, uint8_t * input)

  lon_mmin = (uint16_t)ConvertBitIntoBytes(&input[72], 16); //? bits required, but grabbing two octets
  lon_min  = (uint8_t)ConvertBitIntoBytes(&input[90], 6);  //6 bits required to get 60
-  lon_deg  = (uint8_t)ConvertBitIntoBytes(&input[96], 8); //8 bits required to get 180 
+  lon_deg  = (uint8_t)ConvertBitIntoBytes(&input[96], 8); //8 bits required to get 180
  lon_sign = input[88]; //88, unsure of a correct location, but on the sample with 0 minutes, this lonely bit was flagged on

  int src = 0;
@@ -478,7 +502,7 @@ void harris_gps(dsd_opts * opts, dsd_state * state, int slot, uint8_t * input)
  if (lat_sign)
    lat_dec *= -1.0f;

-  if (lon_sign) 
+  if (lon_sign)
    lon_dec *= -1.0f;

  //line break
@@ -560,10 +584,10 @@ void dmr_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
  char deg_glyph[4];
  sprintf (deg_glyph, "%s", "°");

-  uint32_t lon_sign = lc_bits[23]; 
-  uint32_t lon = (uint32_t)ConvertBitIntoBytes(&lc_bits[24], 24); 
-  uint32_t lat_sign = lc_bits[48]; 
-  uint32_t lat = (uint32_t)ConvertBitIntoBytes(&lc_bits[49], 23); 
+  uint32_t lon_sign = lc_bits[23];
+  uint32_t lon = (uint32_t)ConvertBitIntoBytes(&lc_bits[24], 24);
+  uint32_t lat_sign = lc_bits[48];
+  uint32_t lat = (uint32_t)ConvertBitIntoBytes(&lc_bits[49], 23);
  double lon_sf = 1.0f; //float value we can multiple longitude with
  double lat_sf = 1.0f; //float value we can multiple latitude with

@@ -578,8 +602,8 @@ void dmr_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
  //run calculations and print
  //7.2.16 and 7.2.17 (two's compliment)

-  double latitude = 0;  
-  double longitude = 0; 
+  double latitude = 0;
+  double longitude = 0;

  if (pf) fprintf (stderr, " Protected");
  else
@@ -589,7 +613,7 @@ void dmr_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
      lat = 0x800001 - lat;
      sprintf (latstr, "%s", "S");
      lat_sf = -1.0f;
-    } 
+    }
    latitude = ((double)lat * lat_unit);

    if (lon_sign)
@@ -597,16 +621,16 @@ void dmr_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
      lon = 0x1000001 - lon;
      sprintf (lonstr, "%s", "W");
      lon_sf = -1.0f;
-    } 
+    }
    longitude = ((double)lon * lon_unit);

    //sanity check
-    if (abs (latitude) < 90 && abs(longitude) < 180)
+    if (fabs(latitude) < 90 && fabs(longitude) < 180)
    {
      fprintf (stderr, " Lat: %.5lf%s%s Lon: %.5lf%s%s (%.5lf, %.5lf)", latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, lat_sf * latitude, lon_sf * longitude);

      //7.2.15 Position Error
-      uint16_t position_error = 2 * pow(10, pos_err); //2 * 10^pos_err 
+      uint16_t position_error = 2 * pow(10, pos_err); //2 * 10^pos_err
      if (pos_err == 0x7 ) fprintf (stderr, "\n  Position Error: Unknown or Invalid");
      else fprintf (stderr, "\n  Position Error: Less than %dm", position_error);

@@ -617,6 +641,14 @@ void dmr_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
      }
      else sprintf (state->dmr_embedded_gps[slot], "GPS: %.5lf%s%s %.5lf%s%s Unknown Pos Err", latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr);

+      uint32_t src = 0;
+      if (slot == 0) src = state->lasttg;
+      if (slot == 1) src = state->lasttgR;
+
+      //save to event history string
+      if (state->event_history_s[slot].Event_History_Items[0].source_id == src)
+        sprintf (state->event_history_s[slot].Event_History_Items[0].gps_s, "%s", state->dmr_embedded_gps[slot]);
+
      //save to LRRP report for mapping/logging
      FILE * pFile; //file pointer
      if (opts->lrrp_file_output == 1)
@@ -625,10 +657,6 @@ void dmr_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
        char * datestr = getDate();
        char * timestr = getTime();

-        int src = 0;
-        if (slot == 0) src = state->lasttg;
-        if (slot == 1) src = state->lasttgR;
-
        //open file by name that is supplied in the ncurses terminal, or cli
        pFile = fopen (opts->lrrp_out_file, "a");
        fprintf (pFile, "%s\t", datestr );
@@ -648,8 +676,8 @@ void dmr_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
  fprintf (stderr, "%s", KNRM);
 }

-//This Function has been redone and variables fixed to mirror SDRTrunk 
-//my earlier assumption that this was the same format as DMR Embedded GPS was incorrect
+//This Function needs testing, is tested working for NW and NE lat and
+//long coordinates, but not for SE and SW coordinates
 void apx_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
 {

@@ -664,55 +692,54 @@ void apx_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
  char deg_glyph[4];
  sprintf (deg_glyph, "%s", "°");

-  uint32_t lon_sign = lc_bits[48]; 
-  uint32_t lon = (uint32_t)ConvertBitIntoBytes(&lc_bits[49], 23); 
+  uint32_t lon_sign = lc_bits[48];
+  uint32_t lon = (uint32_t)ConvertBitIntoBytes(&lc_bits[49], 23);
  uint32_t lat_sign = lc_bits[24];
-  uint32_t lat = (uint32_t)ConvertBitIntoBytes(&lc_bits[25], 23); 
-  //todo: acquire more samples for additional validation
+  uint32_t lat = (uint32_t)ConvertBitIntoBytes(&lc_bits[25], 23);
+
  double lat_unit = 90.0f / 0x7FFFFF;
  double lon_unit = 180.0f / 0x7FFFFF;
-  double lon_sf = 1.0f; //float value we can multiple longitude with
-  double lat_sf = 1.0f; //float value we can multiple latitude with

  char latstr[3];
  char lonstr[3];
-  char valid[9];
+  char valid[12];
  sprintf (latstr, "%s", "N");
  sprintf (lonstr, "%s", "E");
-  sprintf (valid, "%s", "Current");
+  sprintf (valid, "%s", "Current Fix");

-  double latitude = 0;  
-  double longitude = 0; 
+  double latitude = 0;
+  double longitude = 0;

  if (pf) fprintf (stderr, " Protected");
  else
  {
+
+    latitude = ((double)lat * lat_unit);
    if (lat_sign)
    {
+      latitude -= 90.0f;
      sprintf (latstr, "%s", "S");
-      lat_sf = -1.0f;
    }
-    latitude = ((double)lat * lat_unit);

+    longitude = ((double)lon * lon_unit);
    if (lon_sign)
    {
+      longitude -= 180.0f;
      sprintf (lonstr, "%s", "W");
-      lon_sf = -1.0f;
    }
-    longitude = ((double)lon * lon_unit);

    //sanity check
-    if (abs (latitude) < 90 && abs(longitude) < 180)
+    if (fabs ((float)latitude) < 90 && fabs((float)longitude) < 180)
    {
-      fprintf (stderr, " Lat: %.5lf%s%s Lon: %.5lf%s%s (%.5lf, %.5lf) ", latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, latitude * lat_sf, longitude * lon_sf);
+      fprintf (stderr, " Lat: %.5lf%s%s Lon: %.5lf%s%s (%.5lf, %.5lf) ", latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, latitude, longitude);

      if (expired)
      {
-        fprintf (stderr, "Expired; ");
-        sprintf (valid, "%s", "Expired");
+        fprintf (stderr, "Last Fix; ");
+        sprintf (valid, "%s", "Last Fix");
      }
      else if (!expired)
-        fprintf (stderr, "Current; ");
+        fprintf (stderr, "Current Fix; ");

      if (res_a)
        fprintf (stderr, "RES_A: %d; ", res_a);
@@ -720,17 +747,21 @@ void apx_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
      if (res_b)
        fprintf (stderr, "RES_B: %02X; ", res_b);

+      uint32_t src = 0;
+      if (slot == 0) src = state->lastsrc;
+      if (slot == 1) src = state->lastsrcR;
+
      //save to array for ncurses
-      sprintf (state->dmr_embedded_gps[slot], "GPS: %lf%s%s %lf%s%s %s", latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, valid);
+      sprintf (state->dmr_embedded_gps[slot], "GPS: %lf%s%s %lf%s%s (%lf, %lf) %s", latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, latitude, longitude, valid);
+
+      //save to event history string
+      if (state->event_history_s[slot].Event_History_Items[0].source_id == src)
+        sprintf (state->event_history_s[slot].Event_History_Items[0].gps_s, "%s", state->dmr_embedded_gps[slot]);

      //save to LRRP report for mapping/logging
      FILE * pFile; //file pointer
      if (opts->lrrp_file_output == 1)
      {
-        int src = 0;
-        if (slot == 0) src = state->lastsrc;
-        if (slot == 1) src = state->lastsrcR;
-
        char * datestr = getDate();
        char * timestr = getTime();

@@ -763,4 +794,44 @@ void apx_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
  }

  fprintf (stderr, "%s", KNRM);
-}
+}
+
+void decode_cellocator(dsd_opts * opts, dsd_state * state, uint8_t * input, int len)
+{
+  //TODO: This
+  UNUSED(opts);
+  UNUSED(state);
+  UNUSED(input);
+  UNUSED(len);
+
+  //UTF8 Text: MCGP (0x4D434750) followed by data values
+  //(0417D1050000F45FD1DD00010000000097BDD56C81000009AAAABF12864C)
+  utf8_to_text(state, 0, 4, input);
+
+  fprintf (stderr, " Cellocator:");
+
+  uint8_t type = input[4];
+  if      (type == 1)  fprintf (stderr, " Platform Manifest Data;");
+  else if (type == 2)  fprintf (stderr, " CAN Data;");
+  else if (type == 3)  fprintf (stderr, " CAN Trigger Data;");
+  else if (type == 4)  fprintf (stderr, " Time and Location Data;");
+  else if (type == 5)  fprintf (stderr, " Accelerometer Data;");
+  else if (type == 6)  fprintf (stderr, " PSP Alarm System Data;");
+  else if (type == 7)  fprintf (stderr, " Usage Counter Data;");
+  else if (type == 8)  fprintf (stderr, " Command Authentication Table Data;");
+  else if (type == 9)  fprintf (stderr, " GSM Neighbor List Data;");
+  else if (type == 10) fprintf (stderr, " Maintenance Server Platform Manifest Data;");
+  else fprintf (stderr, " Unknown Data;");
+
+  //Data afterwards appears to be an arbitrary len so has variable reporting data
+  //will need to establish a len value for data and contents
+
+}
+void decode_ars(dsd_opts * opts, dsd_state * state, uint8_t * input, int len)
+{
+  //TODO: This
+  UNUSED(opts);
+  UNUSED(state);
+  UNUSED(input);
+  UNUSED(len);
+}
--- a/src/dsd_import.c
+++ b/src/dsd_import.c
@@ -5,8 +5,8 @@

 int csvGroupImport(dsd_opts * opts, dsd_state * state)
 {
-  char filename[1024] = "filename.csv"; 
-  sprintf (filename, "%s", opts->group_in_file); 
+  char filename[1024] = "filename.csv";
+  sprintf (filename, "%s", opts->group_in_file);
  //filename[1023] = '\0'; //necessary?
  char buffer[BSIZE];
  FILE * fp;
@@ -27,7 +27,7 @@ int csvGroupImport(dsd_opts * opts, dsd_state * state)
      continue; //don't want labels
    char * field = strtok(buffer, ","); //seperate by comma
    while (field) {
-      
+
      if (field_count == 0)
      {
        //group_number = atol(field);
@@ -44,23 +44,23 @@ int csvGroupImport(dsd_opts * opts, dsd_state * state)
        strcpy(state->group_array[i].groupName, field);
        fprintf (stderr, "%s ", state->group_array[i].groupName);
      }
- 
+
      field = strtok(NULL, ",");
      field_count++;
    }
    fprintf (stderr, "\n");
    i++;
-    state->group_tally++; 
+    state->group_tally++;
  }
  fclose(fp);
  return 0;
 }

 //LCN import for EDACS, migrated to channel map (channel map does both)
-int csvLCNImport(dsd_opts * opts, dsd_state * state) 
+int csvLCNImport(dsd_opts * opts, dsd_state * state)
 {
-  char filename[1024] = "filename.csv"; 
-  sprintf (filename, "%s", opts->lcn_in_file); 
+  char filename[1024] = "filename.csv";
+  sprintf (filename, "%s", opts->lcn_in_file);
  //filename[1023] = '\0'; //necessary?
  char buffer[BSIZE];
  FILE * fp;
@@ -86,12 +86,12 @@ int csvLCNImport(dsd_opts * opts, dsd_state * state)
      fprintf (stderr, "LCN [%d] [%ld]", field_count+1, state->trunk_lcn_freq[field_count]);
      fprintf (stderr, "\n");

-      
+
      field = strtok(NULL, ",");
      field_count++;
    }
    fprintf (stderr, "LCN Count %d\n", state->lcn_freq_count);
-    
+
  }
  fclose(fp);
  return 0;
@@ -99,7 +99,7 @@ int csvLCNImport(dsd_opts * opts, dsd_state * state)

 int csvChanImport(dsd_opts * opts, dsd_state * state) //channel map import
 {
-  char filename[1024] = "filename.csv"; 
+  char filename[1024] = "filename.csv";
  sprintf (filename, "%s", opts->chan_in_file);

  char buffer[BSIZE];
@@ -135,13 +135,13 @@ int csvChanImport(dsd_opts * opts, dsd_state * state) //channel map import
        sscanf (field, "%ld", &state->trunk_lcn_freq[state->lcn_freq_count]);
        state->lcn_freq_count++; //keep tally of number of Frequencies imported
      }
-      
+
      field = strtok(NULL, ",");
      field_count++;
    }
    fprintf (stderr, "Channel [%05ld] [%09ld]", chan_number, state->trunk_chan_map[chan_number]);
    fprintf (stderr, "\n");
-    
+
  }
  fclose(fp);
  return 0;
@@ -150,7 +150,7 @@ int csvChanImport(dsd_opts * opts, dsd_state * state) //channel map import
 //Decimal Variant of Key Import
 int csvKeyImportDec(dsd_opts * opts, dsd_state * state) //multi-key support
 {
-  char filename[1024] = "filename.csv"; 
+  char filename[1024] = "filename.csv";
  sprintf (filename, "%s", opts->key_in_file);

  char buffer[BSIZE];
@@ -162,7 +162,7 @@ int csvKeyImportDec(dsd_opts * opts, dsd_state * state) //multi-key support
  }
  int row_count = 0;
  int field_count = 0;
-  
+
  unsigned long long int keynumber = 0;
  unsigned long long int keyvalue = 0;

@@ -186,13 +186,13 @@ int csvKeyImportDec(dsd_opts * opts, dsd_state * state) //multi-key support
          keynumber = keynumber & 0xFFFFFF; //truncate to 24-bits (max allowed)
          for (int i = 0; i < 24; i++)
          {
-            hash_bits[i] = ((keynumber << i) & 0x800000) >> 23; //load into array for CRC16 
+            hash_bits[i] = ((keynumber << i) & 0x800000) >> 23; //load into array for CRC16
          }
          hash = ComputeCrcCCITT16d (hash_bits, 24);
          keynumber = hash & 0xFFFF; //make sure its no larger than 16-bits
          fprintf (stderr, "Hashed ");
        }
-        
+
      }

      if (field_count == 1)
@@ -200,21 +200,21 @@ int csvKeyImportDec(dsd_opts * opts, dsd_state * state) //multi-key support
        sscanf (field, "%lld", &keyvalue);
        state->rkey_array[keynumber] = keyvalue & 0xFFFFFFFFFF; //doesn't exceed 40-bit value
      }
-      
+
      field = strtok(NULL, ",");
      field_count++;
    }
    fprintf (stderr, "Key [%03lld] [%05lld]", keynumber, state->rkey_array[keynumber]);
    fprintf (stderr, "\n");
    hash = 0;
-    
+
  }
  fclose(fp);
  return 0;
 }

 //Hex Variant of Key Import
-int csvKeyImportHex(dsd_opts * opts, dsd_state * state) //key import for rc4 keys
+int csvKeyImportHex(dsd_opts * opts, dsd_state * state) //key import for hex keys
 {
  char filename[1024] = "filename.csv";
  sprintf (filename, "%s", opts->key_in_file);
@@ -246,13 +246,34 @@ int csvKeyImportHex(dsd_opts * opts, dsd_state * state) //key import for rc4 key
      {
        sscanf (field, "%llX", &state->rkey_array[keynumber]);
      }
-      
+
+      //this could also theoretically nuke other keys that are at the same offset
+      if (field_count == 2)
+      {
+        sscanf (field, "%llX", &state->rkey_array[keynumber+0x101]);
+      }
+
+      if (field_count == 3)
+      {
+        sscanf (field, "%llX", &state->rkey_array[keynumber+0x201]);
+      }
+
+      if (field_count == 4)
+      {
+        sscanf (field, "%llX", &state->rkey_array[keynumber+0x301]);
+      }
+
      field = strtok(NULL, ",");
      field_count++;
    }
+
    fprintf (stderr, "Key [%04llX] [%016llX]", keynumber, state->rkey_array[keynumber]);
+
+    //if longer key is loaded (or clash with the 0x101, 0x201, 0x301 offset, then print the full key listing)
+    if ( (state->rkey_array[keynumber+0x101] != 0) || (state->rkey_array[keynumber+0x201] != 0) || (state->rkey_array[keynumber+0x301] != 0) )
+      fprintf (stderr, " [%016llX] [%016llX] [%016llX]", state->rkey_array[keynumber+0x101], state->rkey_array[keynumber+0x201], state->rkey_array[keynumber+0x301]);
    fprintf (stderr, "\n");
-    
+
  }
  fclose(fp);
  return 0;
--- a/src/dsd_ks.c
+++ b/src/dsd_ks.c
@@ -2,6 +2,6 @@
 * dsd_ks.c
 * Placeholder File 6 -- This file is for temporary code storage
 *
- * 
- * 
+ *
+ *
 *-----------------------------------------------------------------------------*/
--- a/src/dsd_main.c
+++ b/src/dsd_main.c
--- a/src/dsd_mbe.c
+++ b/src/dsd_mbe.c
--- a/src/dsd_mbe2.c
+++ b/src/dsd_mbe2.c
@@ -1,14 +1,14 @@
 /*-------------------------------------------------------------------------------
- * 
- * 
+ *
+ *
 *
 * TODO: Fill me in'
- * 
+ *
 *
 * LWVMOBILE
 * 2023-07 DSD-FME Florida Man Edition
 *-----------------------------------------------------------------------------*/
- 
+
 //new and simplified/organized ambe and imbe handling
 //moving all audio handling and decryption to seperate files for simplicity (eventually)

@@ -54,7 +54,7 @@ void soft_demod_ambe2_ehr(dsd_state * state, char ambe2_ehr[4][24], char ambe_d[
 //AMBE One Shot (DSTAR)
 void soft_demod_ambe_dstar(dsd_opts * opts, dsd_state * state, char ambe_fr[4][24], char ambe_d[49])
 {
-  mbe_processAmbe3600x2400Framef (state->audio_out_temp_buf, &state->errs, &state->errs2, 
+  mbe_processAmbe3600x2400Framef (state->audio_out_temp_buf, &state->errs, &state->errs2,
    state->err_str, ambe_fr, ambe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
  if (opts->floating_point == 1)
    memcpy (state->f_l, state->audio_out_temp_buf, sizeof(state->f_l));
@@ -64,7 +64,7 @@ void soft_demod_ambe_dstar(dsd_opts * opts, dsd_state * state, char ambe_fr[4][2
 //AMBE+2 One Shot (X2-TDMA)
 void soft_demod_ambe_x2(dsd_opts * opts, dsd_state * state, char ambe_fr[4][24], char ambe_d[49])
 {
-  mbe_processAmbe3600x2450Framef (state->audio_out_temp_buf, &state->errs, &state->errs2, 
+  mbe_processAmbe3600x2450Framef (state->audio_out_temp_buf, &state->errs, &state->errs2,
    state->err_str, ambe_fr, ambe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
  if (opts->floating_point == 1)
    memcpy (state->f_l, state->audio_out_temp_buf, sizeof(state->f_l));
@@ -73,7 +73,7 @@ void soft_demod_ambe_x2(dsd_opts * opts, dsd_state * state, char ambe_fr[4][24],

 void soft_mbe (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char ambe_fr[4][24], char imbe7100_fr[7][24])
 {
-  int i; 
+  int i;
  char ambe_d[49];
  char imbe_d[88];
  int slot = state->currentslot;
@@ -92,7 +92,7 @@ void soft_mbe (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char amb
      imbe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
    //send to playback here
  }
-    
+
  //ProVoice
  else if (state->synctype == 14 || state->synctype == 15)
  {
@@ -106,7 +106,7 @@ void soft_mbe (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char amb
    //send to playback here

  }
-    
+
  //D-STAR AMBE
  else if (state->synctype == 6 || state->synctype == 7)
  {
@@ -123,9 +123,11 @@ void soft_mbe (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char amb
    if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
      playSynthesizedVoiceFS(opts, state);

-    if (opts->wav_out_f != NULL)
+    if (opts->wav_out_f != NULL && opts->dmr_stereo_wav == 1)
      writeSynthesizedVoice (opts, state);

+    //single wav file handled by playSynthesizedVoiceMS
+
    if (opts->mbe_out_f != NULL)
      saveAmbe2450Data (opts, state, ambe_d);
  }
@@ -163,15 +165,15 @@ void soft_mbe (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char amb
    //make left or right channel decision
    if (slot == 0)
    {
-      mbe_processAmbe2450Dataf (state->audio_out_temp_buf, &state->errs, &state->errs2, state->err_str, 
+      mbe_processAmbe2450Dataf (state->audio_out_temp_buf, &state->errs, &state->errs2, state->err_str,
        ambe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
    }
    if (slot == 1)
    {
-      mbe_processAmbe2450Dataf (state->audio_out_temp_bufR, &state->errsR, &state->errs2R, state->err_strR, 
+      mbe_processAmbe2450Dataf (state->audio_out_temp_bufR, &state->errsR, &state->errs2R, state->err_strR,
        ambe_d, state->cur_mp2, state->prev_mp2, state->prev_mp_enhanced2, opts->uvquality);
    }
-    
+
  }
 }

--- a/src/dsd_misc.c
+++ b/src/dsd_misc.c
@@ -1,9 +1,9 @@
 /*-------------------------------------------------------------------------------
- * 3.c
- * Placeholder File 3 -- This file is for temporary code storage
+ * dsd_misc.c
+ * Misc Code that needs to be reorganized and sorted out
+ *
+ *
 *
- * Multiple 1/2 Rate Convolutional Decoders for NXDN/M17/YSF
- * Used as a secondary decoder in case convolutional decoder fails (second opinion)
 *-----------------------------------------------------------------------------*/

 #include "dsd.h"
@@ -57,7 +57,7 @@ void trellis_decode(uint8_t result[], const uint8_t source[], int result_len)
 		reg = (reg << 1) | min_bt;
 		dstats[(min_d > 3) ? 3 : min_d] += 1;
 	}
-	
+
 	//debug output
 	// fprintf (stderr, "\n stats\t%d %d %d %d\n", dstats[0], dstats[1], dstats[2], dstats[3]);
 }
@@ -65,21 +65,21 @@ void trellis_decode(uint8_t result[], const uint8_t source[], int result_len)
 //Original Copyright/License

 /* -*- c++ -*- */
-/* 
+/*
 * NXDN Encoder/Decoder (C) Copyright 2019 Max H. Parke KA1RBI
- * 
+ *
 * This file is part of OP25
- * 
+ *
 * This is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 3, or (at your option)
 * any later version.
- * 
+ *
 * This software is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with this software; see the file COPYING.  If not, write to
 * the Free Software Foundation, Inc., 51 Franklin Street,
@@ -385,7 +385,7 @@ void HPFilter_Init(HPFilter *filter, float cutoffFreqHz, float sampleTimeS)

 float HPFilter_Update(HPFilter *filter, float v_in)
 {
-    
+
 	filter->v_in[1]=filter->v_in[0];
 	filter->v_in[0]=v_in;

@@ -493,7 +493,7 @@ void init_audio_filters (dsd_state * state)
 	//passband filter working (seems to be), notch filter unsure which values to use, doesn't have any appreciable affect when used as is
 	PBFilter_Init(&state->PBF, 8000, 12000, (float)1/(float)1536000); //RTL Sampling at 1536000 S/s.
 	NOTCHFilter_Init(&state->NF, 1000, 4000, (float)1/(float)1536000);
-	
+
 }

 //FUNCTIONS for handing use of above filters
@@ -572,7 +572,7 @@ void pbf(dsd_state * state, short * input, int len)
 //Generic RMS function derived from RTL_FM (RTL_SDR) RMS code (doesnt' really work correctly outside of RTL)
 long int raw_rms(int16_t *samples, int len, int step) //use samplespersymbol as len
 {
-  
+
  int i;
  long int rms;
  long p, t, s;
@@ -591,4 +591,131 @@ long int raw_rms(int16_t *samples, int len, int step) //use samplespersymbol as
  rms = (long int)sqrt((p-err) / len);
  if (rms < 0) rms = 150;
  return rms;
-}
+}
+
+//same as symbol levels in m17.h (m17-fme version)
+const int8_t symbol_list[4]={-3, -1, +1, +3};
+
+/**
+ * @brief Slice payload symbols into soft dibits.
+ * Input (RRC filtered baseband sampled at symbol centers)
+ * should be already normalized to {-3, -1, +1 +3}.
+ * @param out Soft valued dibits (type-4).
+ * @param inp Array of 184 floats (1 sample per symbol).
+ */
+void slice_symbols(uint16_t out[2*SYM_PER_PLD], const float inp[SYM_PER_PLD])
+{
+
+    for(uint8_t i=0; i<SYM_PER_PLD; i++)
+    {
+        //bit 0
+        if(inp[i]>=symbol_list[3])
+        {
+            out[i*2+1]=0xFFFF;
+        }
+        else if(inp[i]>=symbol_list[2])
+        {
+            out[i*2+1]=-(float)0xFFFF/(symbol_list[3]-symbol_list[2])*symbol_list[2]+inp[i]*(float)0xFFFF/(symbol_list[3]-symbol_list[2]);
+        }
+        else if(inp[i]>=symbol_list[1])
+        {
+            out[i*2+1]=0x0000;
+        }
+        else if(inp[i]>=symbol_list[0])
+        {
+            out[i*2+1]=(float)0xFFFF/(symbol_list[1]-symbol_list[0])*symbol_list[1]-inp[i]*(float)0xFFFF/(symbol_list[1]-symbol_list[0]);
+        }
+        else
+        {
+            out[i*2+1]=0xFFFF;
+        }
+
+        //bit 1
+        if(inp[i]>=symbol_list[2])
+        {
+            out[i*2]=0x0000;
+        }
+        else if(inp[i]>=symbol_list[1])
+        {
+            out[i*2]=0x7FFF-inp[i]*(float)0xFFFF/(symbol_list[2]-symbol_list[1]);
+        }
+        else
+        {
+            out[i*2]=0xFFFF;
+        }
+    }
+}
+
+/**
+ * @brief Soft logic NOT.
+ * 
+ * @param a Input A.
+ * @return uint16_t Output = not A.
+ */
+uint16_t soft_bit_NOT(const uint16_t a)
+{
+    return 0xFFFFU-a;
+}
+
+//randomizing pattern
+const uint8_t rand_seq[46]=
+{
+    0xD6, 0xB5, 0xE2, 0x30, 0x82, 0xFF, 0x84, 0x62, 0xBA, 0x4E, 0x96, 0x90, 0xD8, 0x98, 0xDD, 0x5D, 0x0C, 0xC8, 0x52, 0x43, 0x91, 0x1D, 0xF8,
+    0x6E, 0x68, 0x2F, 0x35, 0xDA, 0x14, 0xEA, 0xCD, 0x76, 0x19, 0x8D, 0xD5, 0x80, 0xD1, 0x33, 0x87, 0x13, 0x57, 0x18, 0x2D, 0x29, 0x78, 0xC3
+};
+
+/**
+ * @brief Randomize type-4 soft bits.
+ * 
+ * @param inp Input 368 soft type-4 bits.
+ */
+void randomize_soft_bits(uint16_t inp[SYM_PER_PLD*2])
+{
+    for(uint16_t i=0; i<SYM_PER_PLD*2; i++)
+    {
+        if((rand_seq[i/8]>>(7-(i%8)))&1) //flip bit if '1'
+        {
+            inp[i]=soft_bit_NOT(inp[i]);
+        }
+    }
+}
+
+//interleaver pattern
+const uint16_t intrl_seq[SYM_PER_PLD*2]=
+{
+	0, 137, 90, 227, 180, 317, 270, 39, 360, 129, 82, 219, 172, 309, 262, 31,
+	352, 121, 74, 211, 164, 301, 254, 23, 344, 113, 66, 203, 156, 293, 246, 15,
+	336, 105, 58, 195, 148, 285, 238, 7, 328, 97, 50, 187, 140, 277, 230, 367,
+	320, 89, 42, 179, 132, 269, 222, 359, 312, 81, 34, 171, 124, 261, 214, 351,
+	304, 73, 26, 163, 116, 253, 206, 343, 296, 65, 18, 155, 108, 245, 198, 335,
+	288, 57, 10, 147, 100, 237, 190, 327, 280, 49, 2, 139, 92, 229, 182, 319,
+	272, 41, 362, 131, 84, 221, 174, 311, 264, 33, 354, 123, 76, 213, 166, 303,
+	256, 25, 346, 115, 68, 205, 158, 295, 248, 17, 338, 107, 60, 197, 150, 287,
+	240, 9, 330, 99, 52, 189, 142, 279, 232, 1, 322, 91, 44, 181, 134, 271,
+	224, 361, 314, 83, 36, 173, 126, 263, 216, 353, 306, 75, 28, 165, 118, 255,
+	208, 345, 298, 67, 20, 157, 110, 247, 200, 337, 290, 59, 12, 149, 102, 239,
+	192, 329, 282, 51, 4, 141, 94, 231, 184, 321, 274, 43, 364, 133, 86, 223,
+	176, 313, 266, 35, 356, 125, 78, 215, 168, 305, 258, 27, 348, 117, 70, 207,
+	160, 297, 250, 19, 340, 109, 62, 199, 152, 289, 242, 11, 332, 101, 54, 191,
+	144, 281, 234, 3, 324, 93, 46, 183, 136, 273, 226, 363, 316, 85, 38, 175,
+	128, 265, 218, 355, 308, 77, 30, 167, 120, 257, 210, 347, 300, 69, 22, 159,
+	112, 249, 202, 339, 292, 61, 14, 151, 104, 241, 194, 331, 284, 53, 6, 143,
+	96, 233, 186, 323, 276, 45, 366, 135, 88, 225, 178, 315, 268, 37, 358, 127,
+	80, 217, 170, 307, 260, 29, 350, 119, 72, 209, 162, 299, 252, 21, 342, 111,
+	64, 201, 154, 291, 244, 13, 334, 103, 56, 193, 146, 283, 236, 5, 326, 95,
+	48, 185, 138, 275, 228, 365, 318, 87, 40, 177, 130, 267, 220, 357, 310, 79,
+	32, 169, 122, 259, 212, 349, 302, 71, 24, 161, 114, 251, 204, 341, 294, 63,
+	16, 153, 106, 243, 196, 333, 286, 55, 8, 145, 98, 235, 188, 325, 278, 47
+};
+
+/**
+ * @brief Reorder (interleave) 368 soft bits.
+ * 
+ * @param outp Reordered soft bits.
+ * @param inp Input soft bits.
+ */
+void reorder_soft_bits(uint16_t outp[SYM_PER_PLD*2], const uint16_t inp[SYM_PER_PLD*2])
+{
+    for(uint16_t i=0; i<SYM_PER_PLD*2; i++)
+        outp[i]=inp[intrl_seq[i]];
+}
--- a/src/dsd_ncurses.c
+++ b/src/dsd_ncurses.c
--- a/src/dsd_ncurses_handler.c
+++ b/src/dsd_ncurses_handler.c
@@ -0,0 +1,925 @@
+/*-------------------------------------------------------------------------------
+* dsd_ncurses_handler.c
+* DSD-FME ncurses terminal user input handler
+*
+* LWVMOBILE
+* 2025-05 DSD-FME Florida Man Edition
+*-----------------------------------------------------------------------------*/
+
+#include "dsd.h"
+
+uint8_t ncurses_input_handler(dsd_opts * opts, dsd_state * state, int c)
+{
+
+  struct stat st_wav = {0};
+
+  // //debug char value
+  // if (c != -1)
+  //   fprintf (stderr, "\n User Input: %i / %c ;;", c, c);
+
+  //TEST: Handle Escape Characters
+  //if issues arise, just go back to the way it was before
+  //this is primarly a fix for scroll wheel activatign the menu
+  //and Windows Powershell right-click doing a copy and paste 
+  //and sendign tons of garbage getch chars here and changing things
+  if (c == '\033')
+  {
+    //TODO: Find way to getch all the chars immediately after, or just
+    //run getch in a loop in case of somebody copying and pasting a ton of things accidentally
+    for (int i = 0; i < 100000; i++) //wonder how slow this will be
+       getch();
+    c = -1;
+    return 1;
+  }
+
+  //keyboard shortcuts - codes same as ascii codes
+  if (c == 10) //Return / Enter key, open menu
+    ncursesMenu (opts, state);
+
+  //use k and l keys to test tg hold toggles on slots 1 and slots 2
+  if (c == 107) //'k' key, hold tg on slot 1 for trunking purposes, or toggle clear
+  {
+    if (state->tg_hold == 0)
+      state->tg_hold = state->lasttg;
+    else state->tg_hold = 0;
+
+    if ( (opts->frame_nxdn48 == 1 || opts->frame_nxdn96 == 1) && (state->tg_hold == 0) )
+      state->tg_hold = state->nxdn_last_tg;
+
+    else if (opts->frame_provoice == 1 && state->ea_mode == 0)
+      state->tg_hold = state->lastsrc;
+  }
+
+  if (c == 108) //'l' key, hold tg on slot 2 for trunking purposes, or toggle clear
+  {
+    if (state->tg_hold == 0)
+      state->tg_hold = state->lasttgR;
+    else state->tg_hold = 0;
+  }
+
+  //toggling when 48k/1 OSS still has some lag -- needed to clear out the buffer when switching
+  if (c == 49) // '1' key, toggle slot1 on
+  {
+    //switching, but want to control each seperately plz
+    if (opts->slot1_on == 1)
+    {
+      opts->slot1_on = 0; if (opts->slot_preference == 0) opts->slot_preference = 2;
+      // opts->slot_preference = 1; //slot 2
+      //clear any previously buffered audio
+      state->audio_out_float_buf_p = state->audio_out_float_buf + 100;
+      state->audio_out_buf_p = state->audio_out_buf + 100;
+      memset (state->audio_out_float_buf, 0, 100 * sizeof (float));
+      memset (state->audio_out_buf, 0, 100 * sizeof (short));
+      state->audio_out_idx2 = 0;
+      state->audio_out_idx = 0;
+    }
+    else if (opts->slot1_on == 0)
+    {
+      opts->slot1_on = 1;
+      if (opts->audio_out_type == 5) //OSS 48k/1
+      {
+        opts->slot_preference = 0; //slot 1
+        // opts->slot2_on = 0; //turn off slot 2
+      }
+    }
+  }
+
+  if (c == 50) // '2' key, toggle slot2 on
+  {
+    //switching, but want to control each seperately plz
+    if (opts->slot2_on == 1)
+    {
+      opts->slot2_on = 0;
+      opts->slot_preference = 0; //slot 1
+      //clear any previously buffered audio
+      state->audio_out_float_buf_pR = state->audio_out_float_bufR + 100;
+      state->audio_out_buf_pR = state->audio_out_bufR + 100;
+      memset (state->audio_out_float_bufR, 0, 100 * sizeof (float));
+      memset (state->audio_out_bufR, 0, 100 * sizeof (short));
+      state->audio_out_idx2R = 0;
+      state->audio_out_idxR = 0;
+    }
+    else if (opts->slot2_on == 0)
+    {
+      opts->slot2_on = 1;
+      if (opts->audio_out_type == 5) //OSS 48k/1
+      {
+        opts->slot_preference = 1; //slot 2
+        // opts->slot1_on = 0; //turn off slot 1
+      }
+    }
+  }
+
+  // if (c == 51) //'3' key, toggle slot preference on 48k/1
+  // {
+  //   if (opts->slot_preference == 1) opts->slot_preference = 0;
+  //   else opts->slot_preference = 1;
+  // }
+
+  if (c == 51) //'3' key, cycle slot preference
+  {
+    if (opts->slot_preference == 0 || opts->slot_preference == 1) opts->slot_preference++;
+    else opts->slot_preference = 0;
+  }
+
+  if (c == 43) //+ key, increment audio_gain
+  {
+
+    if (opts->audio_gain < 50)
+      opts->audio_gain++;
+
+    state->aout_gain = opts->audio_gain;
+    state->aout_gainR = opts->audio_gain;
+
+    opts->audio_gainR = opts->audio_gain;
+
+  }
+
+  if (c == 45) //- key, decrement audio_gain
+  {
+
+    if (opts->audio_gain > 0)
+      opts->audio_gain--;
+
+    state->aout_gain = opts->audio_gain;
+    state->aout_gainR = opts->audio_gain;
+
+    //reset to default on 0 for auto
+    if (opts->audio_gain == 0)
+    {
+      state->aout_gain = 25;
+      state->aout_gainR = 25;
+    }
+
+    opts->audio_gainR = opts->audio_gain;
+
+  }
+
+  if (c == 42) // * key, increment audio_gainA
+  {
+    if (opts->audio_gainA < 100)
+      opts->audio_gainA++;
+  }
+
+  if (c == 47) // / key, decrement audio_gainA
+  {
+    if (opts->audio_gainA > 0)
+      opts->audio_gainA--;
+  }
+
+  if (c == 122) //'z' key, toggle payload to console
+  {
+    if (opts->payload == 1) opts->payload = 0;
+    else opts->payload = 1;
+  }
+
+  if (c == 99) //'c' key, toggle compact mode
+  {
+    if (opts->ncurses_compact == 1) opts->ncurses_compact = 0;
+    else opts->ncurses_compact = 1;
+  }
+
+  if (c == 116) //'t' key, toggle trunking
+  {
+    if (opts->p25_trunk == 1) opts->p25_trunk = 0;
+    else opts->p25_trunk = 1;
+  }
+
+  if (c == 121) //'y' key, toggle scanner mode
+ {
+  if (opts->scanner_mode == 1) opts->scanner_mode = 0;
+  else opts->scanner_mode = 1;
+  opts->p25_trunk = 0; //turn off trunking mode
+ }
+
+  if (c == 97) //'a' key, toggle call alert beep
+  {
+    if (opts->call_alert == 1) opts->call_alert = 0;
+    else opts->call_alert = 1;
+  }
+
+  if (c == 104) //'h' key, cycle history off, short, long
+  {
+    opts->ncurses_history++;
+    opts->ncurses_history %= 3;
+  }
+
+  if (c == 113) //'q' key, quit
+  {
+    exitflag = 1;
+  }
+
+  if (c == 52) // '4' key, toggle force privacy key over fid and svc (dmr)
+  {
+    if (state->forced_alg_id == 1 || state->forced_alg_id == 0x21) state->forced_alg_id = 0;
+    else state->forced_alg_id = 1;
+  }
+
+  if (c == 54) // '6' key, toggle force rc4 key over missing pi header/late entry
+  {
+    if (state->forced_alg_id == 1 || state->forced_alg_id == 0x21) state->forced_alg_id = 0;
+    else state->forced_alg_id = 0x21;
+  }
+
+  if (c == 105) //'i' key, toggle signal inversion on inverted types
+  {
+    //Set all signal for inversion or uninversion
+    if (opts->inverted_dmr == 0)
+    {
+      opts->inverted_dmr = 1;
+      opts->inverted_dpmr = 1;
+      opts->inverted_x2tdma = 1;
+      opts->inverted_ysf = 1;
+    }
+    else
+    {
+      opts->inverted_dmr = 0;
+      opts->inverted_dpmr = 0;
+      opts->inverted_x2tdma = 0;
+      opts->inverted_ysf = 0;
+    }
+  }
+
+  if (c == 109) //'m' key, toggle qpsk/c4fm - everything but phase 2
+  {
+    if (state->rf_mod == 0)
+    {
+      opts->mod_c4fm = 0;
+      opts->mod_qpsk = 1;
+      opts->mod_gfsk = 0;
+      state->rf_mod = 1;
+      state->samplesPerSymbol = 10;
+      state->symbolCenter = 4;
+    }
+    else
+    {
+      opts->mod_c4fm = 1;
+      opts->mod_qpsk = 0;
+      opts->mod_gfsk = 0;
+      state->rf_mod = 0;
+      state->samplesPerSymbol = 10;
+      state->symbolCenter = 4;
+    }
+  }
+
+  if (c == 77) //'M' key, toggle qpsk - phase 2 6000 sps
+  {
+    if (state->rf_mod == 0)
+    {
+      opts->mod_c4fm = 0;
+      opts->mod_qpsk = 1;
+      opts->mod_gfsk = 0;
+      state->rf_mod = 1;
+      state->samplesPerSymbol = 8;
+      state->symbolCenter = 3;
+    }
+    else
+    {
+      opts->mod_c4fm = 1;
+      opts->mod_qpsk = 0;
+      opts->mod_gfsk = 0;
+      state->rf_mod = 0;
+      state->samplesPerSymbol = 8;
+      state->symbolCenter = 3;
+    }
+  }
+
+  if (c == 82) //'R', save symbol capture bin with date/time string as name
+  {
+    //for filenames (no colons, etc)
+    char * timestr = getTime();
+    char * datestr = getDate();
+    sprintf (opts->symbol_out_file, "%s_%s_dibit_capture.bin", datestr, timestr);
+    openSymbolOutFile (opts, state);
+
+    //add a system event to echo in the event history
+    state->event_history_s[0].Event_History_Items[0].color_pair = 4;
+    char event_str[2000]; memset (event_str, 0, sizeof(event_str));
+    sprintf (event_str, "DSD-FME Dibit Capture File Started: %s;", opts->symbol_out_file);
+    watchdog_event_datacall (opts, state, 0xFFFFFF, 0xFFFFFF, event_str, 0);
+    state->lastsrc = 0; //this could wipe a call src if they hit 'R' while call in slot 1 in progress
+    watchdog_event_history(opts, state, 0);
+    watchdog_event_current(opts, state, 0);
+
+    //allocated memory pointer needs to be free'd
+    if (timestr != NULL)
+    {
+      free (timestr);
+      timestr = NULL;
+    }
+    if (datestr != NULL)
+    {
+      free (datestr);
+      datestr = NULL;
+    }
+    opts->symbol_out_file_creation_time = time(NULL);
+    opts->symbol_out_file_is_auto = 1;
+  }
+
+  if (c == 114) //'r' key, stop capturing symbol capture bin file
+  {
+    if (opts->symbol_out_f)
+    {
+      closeSymbolOutFile (opts, state);
+      sprintf (opts->audio_in_dev, "%s", opts->symbol_out_file);
+
+      //add a system event to echo in the event history
+      state->event_history_s[0].Event_History_Items[0].color_pair = 4;
+      char event_str[2000]; memset (event_str, 0, sizeof(event_str));
+      sprintf (event_str, "DSD-FME Dibit Capture File  Closed: %s;", opts->symbol_out_file);
+      watchdog_event_datacall (opts, state, 0xFFFFFF, 0xFFFFFF, event_str, 0);
+      state->lastsrc = 0; //this could wipe a call src if they hit 'R' while call in slot 1 in progress
+      watchdog_event_history(opts, state, 0);
+      watchdog_event_current(opts, state, 0);
+
+    }
+    opts->symbol_out_file_is_auto = 0;
+  }
+
+ #ifdef __CYGWIN__
+ //do nothing
+ #else
+ if (c == 32) //'space bar' replay last bin file (rework to do wav files too?)
+ {
+  struct stat stat_buf;
+  if (stat(opts->audio_in_dev, &stat_buf) != 0)
+  {
+    fprintf (stderr,"Error, couldn't open %s\n", opts->audio_in_dev);
+    goto SKIPR;
+  }
+  if (S_ISREG(stat_buf.st_mode))
+  {
+    opts->symbolfile = fopen(opts->audio_in_dev, "r");
+    opts->audio_in_type = 4; //symbol capture bin files
+  }
+  SKIPR: ; //do nothing
+ }
+ #endif
+
+ if (c == 80) //'P' key - start per call wav files //TODO: Fix
+ {
+  char wav_file_directory[1024];
+  sprintf (wav_file_directory, "%s", opts->wav_out_dir);
+  wav_file_directory[1023] = '\0';
+  if (stat(wav_file_directory, &st_wav) == -1)
+  {
+    fprintf (stderr, "%s wav file directory does not exist\n", wav_file_directory);
+    fprintf (stderr, "Creating directory %s to save decoded wav files\n", wav_file_directory);
+    mkdir(wav_file_directory, 0700);
+  }
+  fprintf (stderr,"\n Per Call Wav File Enabled to Directory: %s;.\n", opts->wav_out_dir);
+  srand(time(NULL)); //seed random for filenames (so two filenames aren't the exact same datetime string on initailization)
+  opts->wav_out_f  = open_wav_file(opts->wav_out_dir, opts->wav_out_file, 8000, 0);
+  opts->wav_out_fR = open_wav_file(opts->wav_out_dir, opts->wav_out_fileR, 8000, 0);
+  opts->dmr_stereo_wav = 1;
+ }
+
+  if (c == 112) //'p' key - stop all per call wav files //TODO: Fix
+  {
+    //TODO: Add Closing of RAW files as well?
+    opts->wav_out_f = close_and_rename_wav_file(opts->wav_out_f, opts->wav_out_file, opts->wav_out_dir, &state->event_history_s[0]);
+    opts->wav_out_fR = close_and_rename_wav_file(opts->wav_out_fR, opts->wav_out_fileR, opts->wav_out_dir, &state->event_history_s[1]);
+    opts->wav_out_file[0] = 0; //Bugfix for decoded wav file display after disabling
+    opts->wav_out_fileR[0] = 0;
+    opts->dmr_stereo_wav = 0;
+  }
+
+  //
+  #ifdef __CYGWIN__ //this might be okay on Aero as well, will need to look into and/or test
+  //
+  #else
+  if (c == 115) //'s' key, stop playing wav or symbol in files
+  {
+    if (opts->symbolfile != NULL)
+    {
+      if (opts->audio_in_type == 4)
+      {
+        fclose(opts->symbolfile);
+      }
+    }
+
+    if (opts->audio_in_type == 2) //wav input file
+    {
+      sf_close(opts->audio_in_file);
+    }
+
+    if (opts->audio_out_type == 0)
+    {
+      opts->audio_in_type = 0;
+      openPulseInput(opts);
+    }
+    else opts->audio_in_type = 5; //exitflag = 1;
+
+  }
+  #endif
+
+  //makes buzzing sound when locked out in new audio config and short, probably something to do with processaudio running or not running
+  if (state->lasttg != 0 && opts->frame_provoice != 1 && c == 33) //SHIFT+'1' key (exclamation point), lockout slot 1 or conventional tg from tuning/playback during session
+  {
+    state->group_array[state->group_tally].groupNumber = state->lasttg;
+    sprintf (state->group_array[state->group_tally].groupMode, "%s", "B");
+    sprintf (state->group_array[state->group_tally].groupName, "%s", "LOCKOUT");
+    state->group_tally++;
+
+    sprintf (state->event_history_s[0].Event_History_Items[0].internal_str, "Target: %d; has been locked out; User Lock Out.", state->lasttg);
+    watchdog_event_current(opts, state, 0);
+    sprintf (state->call_string[0], "%s", "                     "); //21 spaces
+
+    //if we have an opened group file, let's write a group lock out into it to make it permanent
+    if (opts->group_in_file[0] != 0) //file is available
+    {
+      FILE * pFile; //file pointer
+      //open file by name that is supplied in the ncurses terminal, or cli
+      pFile = fopen (opts->group_in_file, "a");
+      fprintf (pFile, "%d,B,LOCKOUT,%02X\n", state->lasttg, state->payload_algid);
+      fclose (pFile);
+    }
+
+    //extra safeguards due to sync issues with NXDN
+    memset (state->nxdn_sacch_frame_segment, 1, sizeof(state->nxdn_sacch_frame_segment));
+    memset (state->nxdn_sacch_frame_segcrc, 1, sizeof(state->nxdn_sacch_frame_segcrc));
+
+    memset (state->active_channel, 0, sizeof(state->active_channel));
+
+    //reset dmr blocks
+    dmr_reset_blocks (opts, state);
+
+    //zero out additional items
+    state->lasttg = 0;
+    state->lasttgR = 0;
+    state->lastsrc = 0;
+    state->lastsrcR = 0;
+    state->payload_algid = 0;
+    state->payload_algidR = 0;
+    state->payload_keyid = 0;
+    state->payload_keyidR = 0;
+    state->payload_mi = 0;
+    state->payload_miR = 0;
+    state->payload_miP = 0;
+    state->payload_miN = 0;
+    opts->p25_is_tuned = 0;
+    state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
+
+    //tune back to the control channel -- NOTE: Doesn't work correctly on EDACS Analog Voice
+    //RIGCTL
+    if (opts->p25_trunk == 1 && opts->use_rigctl == 1)
+    {
+      //drop all items (failsafe)
+      noCarrier(opts, state);
+      if (opts->setmod_bw != 0 )  SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
+      SetFreq(opts->rigctl_sockfd, state->p25_cc_freq);
+    }
+
+    //rtl
+    #ifdef USE_RTLSDR
+    if (opts->p25_trunk == 1 && opts->audio_in_type == 3)
+    {
+      //drop all items (failsafe)
+      noCarrier(opts, state);
+      rtl_dev_tune (opts, state->p25_cc_freq);
+    }
+    #endif
+
+    state->last_cc_sync_time = time(NULL);
+
+    //if P25p2 VCH and going back to P25p1 CC, flip symbolrate
+    if (state->p25_cc_is_tdma == 0)
+    {
+      state->samplesPerSymbol = 10;
+      state->symbolCenter = 4;
+    }
+
+  }
+
+  if (state->lasttgR != 0 && opts->frame_provoice != 1 && c == 64) //SHIFT+'2' key (@ at sign), lockout slot 2 tdma tgR from tuning/playback during session
+  {
+    state->group_array[state->group_tally].groupNumber = state->lasttgR;
+    sprintf (state->group_array[state->group_tally].groupMode, "%s", "B");
+    sprintf (state->group_array[state->group_tally].groupName, "%s", "LOCKOUT");
+    state->group_tally++;
+
+    sprintf (state->event_history_s[1].Event_History_Items[0].internal_str, "Target: %d; has been locked out; User Lock Out.", state->lasttgR);
+    watchdog_event_current(opts, state, 1);
+    sprintf (state->call_string[1], "%s", "                     "); //21 spaces
+
+    //if we have an opened group file, let's write a group lock out into it to make it permanent
+    if (opts->group_in_file[0] != 0) //file is available
+    {
+      FILE * pFile; //file pointer
+      //open file by name that is supplied in the ncurses terminal, or cli
+      pFile = fopen (opts->group_in_file, "a");
+      fprintf (pFile, "%d,B,LOCKOUT,%02X\n", state->lasttgR, state->payload_algidR);
+      fclose (pFile);
+    }
+
+    //extra safeguards due to sync issues with NXDN
+    memset (state->nxdn_sacch_frame_segment, 1, sizeof(state->nxdn_sacch_frame_segment));
+    memset (state->nxdn_sacch_frame_segcrc, 1, sizeof(state->nxdn_sacch_frame_segcrc));
+
+    memset (state->active_channel, 0, sizeof(state->active_channel));
+
+    //reset dmr blocks
+    dmr_reset_blocks (opts, state);
+
+    //zero out additional items
+    state->lasttg = 0;
+    state->lasttgR = 0;
+    state->lastsrc = 0;
+    state->lastsrcR = 0;
+    state->payload_algid = 0;
+    state->payload_algidR = 0;
+    state->payload_keyid = 0;
+    state->payload_keyidR = 0;
+    state->payload_mi = 0;
+    state->payload_miR = 0;
+    state->payload_miP = 0;
+    state->payload_miN = 0;
+    opts->p25_is_tuned = 0;
+    state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
+
+    //tune back to the control channel -- NOTE: Doesn't work correctly on EDACS Analog Voice
+    //RIGCTL
+    if (opts->p25_trunk == 1 && opts->use_rigctl == 1)
+    {
+      //drop all items (failsafe)
+      noCarrier(opts, state);
+      if (opts->setmod_bw != 0 )  SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
+      SetFreq(opts->rigctl_sockfd, state->p25_cc_freq);
+    }
+
+    //rtl
+    #ifdef USE_RTLSDR
+    if (opts->p25_trunk == 1 && opts->audio_in_type == 3)
+    {
+      //drop all items (failsafe)
+      noCarrier(opts, state);
+      rtl_dev_tune (opts, state->p25_cc_freq);
+    }
+    #endif
+
+    state->last_cc_sync_time = time(NULL);
+
+    //if P25p2 VCH and going back to P25p1 CC, flip symbolrate
+    if (state->p25_cc_is_tdma == 0)
+    {
+      state->samplesPerSymbol = 10;
+      state->symbolCenter = 4;
+    }
+
+  }
+
+  if (opts->p25_trunk == 1 && c == 119) //'w' key, toggle white list/black list mode
+  {
+    if (opts->trunk_use_allow_list == 1) opts->trunk_use_allow_list = 0;
+    else opts->trunk_use_allow_list = 1;
+  }
+
+  if (opts->p25_trunk == 1 && c == 117) //'u' key, toggle tune private calls
+  {
+    if (opts->trunk_tune_private_calls == 1) opts->trunk_tune_private_calls = 0;
+    else opts->trunk_tune_private_calls = 1;
+  }
+
+  if (opts->p25_trunk == 1 && c == 100) //'d' key, toggle tune data calls
+  {
+    if (opts->trunk_tune_data_calls == 1) opts->trunk_tune_data_calls = 0;
+    else opts->trunk_tune_data_calls = 1;
+  }
+
+  if (opts->p25_trunk == 1 && c == 101) //'e' key, toggle tune enc calls (P25 only on certain grants)
+  {
+    if (opts->trunk_tune_enc_calls == 1) opts->trunk_tune_enc_calls = 0;
+    else opts->trunk_tune_enc_calls = 1;
+  }
+
+  if (opts->p25_trunk == 1 && c == 103) //'g' key, toggle tune group calls
+  {
+    if (opts->trunk_tune_group_calls == 1) opts->trunk_tune_group_calls = 0;
+    else opts->trunk_tune_group_calls = 1;
+  }
+
+  if (c == 70) //'F' key - toggle agressive sync/crc failure/ras
+  {
+    if (opts->aggressive_framesync == 0) opts->aggressive_framesync = 1;
+    else opts->aggressive_framesync = 0;
+  }
+
+  if (c == 68) //'D' key - Reset DMR Site Parms/Call Strings, etc.
+  {
+    //dmr trunking/ncurses stuff
+    state->dmr_rest_channel = -1; //init on -1
+    state->dmr_mfid = -1; //
+
+    //dmr mfid branding and site parms
+    sprintf(state->dmr_branding_sub, "%s", "");
+    sprintf(state->dmr_branding, "%s", "");
+    sprintf (state->dmr_site_parms, "%s", "");
+
+    //DMR Location Area - DMRLA B***S***
+    opts->dmr_dmrla_is_set = 0;
+    opts->dmr_dmrla_n = 0;
+
+    //reset NXDN info
+    state->nxdn_location_site_code = 0;
+    state->nxdn_location_sys_code = 0;
+    sprintf (state->nxdn_location_category, "%s", " ");
+
+    state->nxdn_last_ran = -1; //0
+    state->nxdn_ran = 0; //0
+
+    state->nxdn_rcn = 0;
+    state->nxdn_base_freq = 0;
+    state->nxdn_step = 0;
+    state->nxdn_bw = 0;
+
+  }
+
+  //Debug/Troubleshooting Option
+  if (c == 90) //'Z' key - Simulate NoCarrier/No VC/CC sync to zero out more stuff (capital Z)
+  {
+    // opts->p25_is_tuned = 0;
+    state->last_cc_sync_time = 0;
+    state->last_vc_sync_time = 0;
+    noCarrier(opts, state);
+  }
+
+  if (c == 93) //']' key - increment event history indexer
+  {
+      state->eh_index++;
+  }
+
+  if (c == 91) //'[' key - decrement event history indexer
+  {
+      state->eh_index--;
+  }
+
+  if (c == 92) //'\' key - toggle events for slot displayed, and reset eh_index
+  {
+    state->eh_slot ^= 1;
+    state->eh_index = 0;
+  }
+
+  //attempt retry to TCP Audio server
+  if (c == 56) // '8' key, try audio in type 8 (TCP Audio Server connection) using defaults OR whatever the user last specified
+  {
+
+    opts->tcp_sockfd = Connect(opts->tcp_hostname, opts->tcp_portno);
+    if (opts->tcp_sockfd != 0)
+    {
+      //reset audio input stream
+      opts->audio_in_file_info = calloc(1, sizeof(SF_INFO));
+      opts->audio_in_file_info->samplerate=opts->wav_sample_rate;
+      opts->audio_in_file_info->channels=1;
+      opts->audio_in_file_info->seekable=0;
+      opts->audio_in_file_info->format=SF_FORMAT_RAW|SF_FORMAT_PCM_16|SF_ENDIAN_LITTLE;
+      opts->tcp_file_in = sf_open_fd(opts->tcp_sockfd, SFM_READ, opts->audio_in_file_info, 0);
+
+      if(opts->tcp_file_in == NULL)
+      {
+        fprintf(stderr, "Error, couldn't Connect to TCP with libsndfile: %s\n", sf_strerror(NULL));
+      }
+      else
+      {
+        //close pulse input if it is currently open
+        if (opts->audio_in_type == 0) closePulseInput(opts);
+        fprintf (stderr, "TCP Socket Connected Successfully.\n");
+        opts->audio_in_type = 8;
+      }
+    }
+    else fprintf (stderr, "TCP Socket Connection Error.\n");
+  }
+
+  if (c == 57) //'9' key, try rigctl connection with default values
+  {
+    //use same or last specified host for TCP audio sink for connection
+    memcpy (opts->rigctlhostname, opts->tcp_hostname, sizeof (opts->rigctlhostname) );
+    opts->rigctl_sockfd = Connect(opts->rigctlhostname, opts->rigctlportno);
+    if (opts->rigctl_sockfd != 0) opts->use_rigctl = 1;
+    else opts->use_rigctl = 0;
+  }
+
+  //if trunking and user wants to just go back to the control channel and skip this call
+  if (opts->p25_trunk == 1 && state->p25_cc_freq != 0 && c == 67) //Capital C key - Return to CC
+  {
+
+    //extra safeguards due to sync issues with NXDN
+    memset (state->nxdn_sacch_frame_segment, 1, sizeof(state->nxdn_sacch_frame_segment));
+    memset (state->nxdn_sacch_frame_segcrc, 1, sizeof(state->nxdn_sacch_frame_segcrc));
+
+    memset (state->active_channel, 0, sizeof(state->active_channel));
+
+    //reset dmr blocks
+    dmr_reset_blocks (opts, state);
+
+    //zero out additional items
+    state->lasttg = 0;
+    state->lasttgR = 0;
+    state->lastsrc = 0;
+    state->lastsrcR = 0;
+    state->payload_algid = 0;
+    state->payload_algidR = 0;
+    state->payload_keyid = 0;
+    state->payload_keyidR = 0;
+    state->payload_mi = 0;
+    state->payload_miR = 0;
+    state->payload_miP = 0;
+    state->payload_miN = 0;
+    opts->p25_is_tuned = 0;
+    state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
+
+    //tune back to the control channel -- NOTE: Doesn't work correctly on EDACS Analog Voice
+    //RIGCTL
+    if (opts->p25_trunk == 1 && opts->use_rigctl == 1)
+    {
+      if (opts->setmod_bw != 0 )  SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
+      SetFreq(opts->rigctl_sockfd, state->p25_cc_freq);
+    }
+
+    //rtl
+    #ifdef USE_RTLSDR
+    if (opts->p25_trunk == 1 && opts->audio_in_type == 3) rtl_dev_tune (opts, state->p25_cc_freq);
+    #endif
+
+    state->last_cc_sync_time = time(NULL);
+
+    //if P25p2 VCH and going back to P25p1 CC, flip symbolrate
+    if (state->p25_cc_is_tdma == 0)
+    {
+      state->samplesPerSymbol = 10;
+      state->symbolCenter = 4;
+    }
+
+    //if P25p1 Data Revert on P25p2 TDMA CC, flip symbolrate
+    if (state->p25_cc_is_tdma == 1)
+    {
+      state->samplesPerSymbol = 8;
+      state->symbolCenter = 3;
+    }
+
+    fprintf (stderr, "\n User Activated Return to CC; \n ");
+
+  }
+
+  //if trunking or scanning, manually cycle forward through channels loaded (can be run without trunking or scanning enabled)
+  if ( (opts->use_rigctl == 1 || opts->audio_in_type == 3) && c == 76) //Capital L key - Cycle Channels Forward
+  {
+
+    //extra safeguards due to sync issues with NXDN
+    memset (state->nxdn_sacch_frame_segment, 1, sizeof(state->nxdn_sacch_frame_segment));
+    memset (state->nxdn_sacch_frame_segcrc, 1, sizeof(state->nxdn_sacch_frame_segcrc));
+
+    memset (state->active_channel, 0, sizeof(state->active_channel));
+
+    //reset dmr blocks
+    dmr_reset_blocks (opts, state);
+
+    //zero out additional items
+    state->lasttg = 0;
+    state->lasttgR = 0;
+    state->lastsrc = 0;
+    state->lastsrcR = 0;
+    state->payload_algid = 0;
+    state->payload_algidR = 0;
+    state->payload_keyid = 0;
+    state->payload_keyidR = 0;
+    state->payload_mi = 0;
+    state->payload_miR = 0;
+    state->payload_miP = 0;
+    state->payload_miN = 0;
+    opts->p25_is_tuned = 0;
+    state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
+
+    //just copy and pasted the cycle logic for CC/signal hunting on no sync
+    if (state->lcn_freq_roll >= state->lcn_freq_count) //fixed this to skip the extra wait out at the end of the list
+    {
+      state->lcn_freq_roll = 0; //reset to zero
+    }
+
+    //roll an extra value up if the current is the same as what's already loaded -- faster hunting on Cap+, etc
+    if (state->lcn_freq_roll != 0)
+    {
+      if (state->trunk_lcn_freq[state->lcn_freq_roll-1] == state->trunk_lcn_freq[state->lcn_freq_roll])
+      {
+        state->lcn_freq_roll++;
+        //check roll again if greater than expected, then go back to zero
+        if (state->lcn_freq_roll >= state->lcn_freq_count)
+        {
+          state->lcn_freq_roll = 0; //reset to zero
+        }
+      }
+    }
+
+    //check that we have a non zero value first, then tune next frequency
+    if (state->trunk_lcn_freq[state->lcn_freq_roll] != 0)
+    {
+      //rigctl
+      if (opts->use_rigctl == 1)
+      {
+        if (opts->setmod_bw != 0 )  SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
+        SetFreq(opts->rigctl_sockfd, state->trunk_lcn_freq[state->lcn_freq_roll]);
+      }
+      //rtl
+      if (opts->audio_in_type == 3)
+      {
+        #ifdef USE_RTLSDR
+        rtl_dev_tune (opts, state->trunk_lcn_freq[state->lcn_freq_roll]);
+        #endif
+      }
+
+      fprintf (stderr, "\n User Activated Channel Cycle;");
+      fprintf (stderr, "  Tuning to Frequency: %.06lf MHz\n",
+                (double)state->trunk_lcn_freq[state->lcn_freq_roll]/1000000);
+
+    }
+    state->lcn_freq_roll++;
+    state->last_cc_sync_time = time(NULL);
+
+
+    //may need to test to see if we want to do the conditional below or not for symbol rate flipping
+
+    //if P25p2 VCH and going back to P25p1 CC, flip symbolrate
+    if (state->p25_cc_is_tdma == 0)
+    {
+      state->samplesPerSymbol = 10;
+      state->symbolCenter = 4;
+    }
+
+    //if P25p1 Data Revert on P25p2 TDMA CC, flip symbolrate
+    if (state->p25_cc_is_tdma == 1)
+    {
+      state->samplesPerSymbol = 8;
+      state->symbolCenter = 3;
+    }
+
+  }
+
+  if (c == 118 && opts->audio_in_type == 3) //'v' key, cycle rtl volume multiplier, when active
+  {
+    if (opts->rtl_volume_multiplier == 1 || opts->rtl_volume_multiplier == 2) opts->rtl_volume_multiplier++;
+    else opts->rtl_volume_multiplier = 1;
+  }
+
+  if (c == 86) // 'V' Key, toggle LPF
+  {
+    if (opts->use_lpf == 0) opts->use_lpf = 1;
+    else opts->use_lpf = 0;
+  }
+
+  if (c == 66) // 'B' Key, toggle HPF
+  {
+    if (opts->use_hpf == 0) opts->use_hpf = 1;
+    else opts->use_hpf = 0;
+  }
+
+  if (c == 78) // 'N' Key, toggle PBF
+  {
+    if (opts->use_pbf == 0) opts->use_pbf = 1;
+    else opts->use_pbf = 0;
+  }
+
+  if (c == 72) // 'H' Key, toggle HPF on digital
+  {
+    if (opts->use_hpf_d == 0) opts->use_hpf_d = 1;
+    else opts->use_hpf_d = 0;
+  }
+
+  if(opts->frame_provoice == 1 && c == 65) //'A' Key, toggle ESK mask 0xA0
+  {
+    if (state->esk_mask == 0) state->esk_mask = 0xA0;
+    else state->esk_mask = 0;
+  }
+
+  if(opts->frame_provoice == 1 && c == 83) //'S' Key, toggle STD or EA mode and reset
+  {
+    if (state->ea_mode == -1) state->ea_mode = 0;
+    else if (state->ea_mode == 0) state->ea_mode = 1;
+    else state->ea_mode = 0;
+
+    //reset -- test to make sure these don't do weird things when reset
+    state->edacs_site_id = 0;
+    state->edacs_lcn_count = 0;
+    state->edacs_cc_lcn = 0;
+    state->edacs_vc_lcn = 0;
+    state->edacs_tuned_lcn = -1;
+    state->edacs_vc_call_type = 0;
+    state->p25_cc_freq = 0;
+    opts->p25_is_tuned = 0;
+    state->lasttg = 0;
+    state->lastsrc = 0;
+
+  }
+
+  //RTL PPM Manual Adjustment
+  if (c == 125)
+    opts->rtlsdr_ppm_error++;
+
+  if (c == 123)
+    opts->rtlsdr_ppm_error--;
+
+  //anything with an entry box will need the inputs and outputs stopped first
+  //so probably just write a function to handle c input, and when c = certain values
+  //needing an entry box, then stop all of those
+
+  return 0;
+
+} //end ncursesPrinter
--- a/src/dsd_ncurses_menu.c
+++ b/src/dsd_ncurses_menu.c
--- a/src/dsd_ncurses_printer.c
+++ b/src/dsd_ncurses_printer.c
--- a/src/dsd_reset.c
+++ b/src/dsd_reset.c
@@ -13,7 +13,7 @@ void resetState (dsd_state * state)

  //Dibit Buffer -- Memset/Init/Allocate Memory
  // state->dibit_buf = malloc (sizeof (int) * 1000000);
-  
+
  state->dibit_buf_p = state->dibit_buf + 200;
  memset (state->dibit_buf, 0, sizeof (int) * 200);
  state->repeat = 0; //repeat frame?
@@ -32,7 +32,7 @@ void resetState (dsd_state * state)

  memset (state->audio_out_buf, 0, 100 * sizeof (short));
  state->audio_out_buf_p = state->audio_out_buf + 100;
-  
+
  memset (state->audio_out_float_buf, 0, 100 * sizeof (float));
  state->audio_out_float_buf_p = state->audio_out_float_buf + 100;

@@ -46,7 +46,7 @@ void resetState (dsd_state * state)

  memset (state->audio_out_bufR, 0, 100 * sizeof (short));
  state->audio_out_buf_pR = state->audio_out_bufR + 100;
-  
+
  memset (state->audio_out_float_bufR, 0, 100 * sizeof (float));
  state->audio_out_float_buf_pR = state->audio_out_float_bufR + 100;

@@ -100,12 +100,12 @@ void resetState (dsd_state * state)
  state->numtdulc = 0;
  state->firstframe = 0;

-  //unsure if these are still used or ever were used, 
+  //unsure if these are still used or ever were used,
  // memset (state->aout_max_buf, 0, sizeof (float) * 200);
  // state->aout_max_buf_p = state->aout_max_buf;
  // state->aout_max_buf_idx = 0;

-  // //MBE Specific 
+  // //MBE Specific
  // //free the memory before allocating it again -- may not use this
  // free (state->cur_mp);
  // free (state->prev_mp);
--- a/src/dsd_rigctl.c
+++ b/src/dsd_rigctl.c
@@ -32,7 +32,6 @@ void error(char *msg) {

 struct sockaddr_in address;
 struct sockaddr_in addressA;
-struct sockaddr_in addressM17;

 //
 // Connect
@@ -51,14 +50,14 @@ int Connect (char *hostname, int portno)
      fprintf(stderr,"ERROR opening socket\n");
      error("ERROR opening socket");
    }
-        
+

    /* gethostbyname: get the server's DNS entry */
    server = gethostbyname(hostname);
    if (server == NULL) {
        fprintf(stderr,"ERROR, no such host as %s\n", hostname);
        //exit(0);
-        return (0); //return 0, check on other end and configure pulse input 
+        return (0); //return 0, check on other end and configure pulse input
    }

    /* build the server's Internet address */
@@ -73,7 +72,7 @@ int Connect (char *hostname, int portno)
    {
        fprintf(stderr,"ERROR opening socket\n");
        return (0);
-    }      
+    }

    return sockfd;
 }
@@ -108,7 +107,7 @@ bool Recv(int sockfd, char *buf)
 //
 // GQRX Protocol
 //
-long int GetCurrentFreq(int sockfd) 
+long int GetCurrentFreq(int sockfd)
 {
    long int freq = 0;
    char buf[BUFSIZE];
@@ -116,13 +115,13 @@ long int GetCurrentFreq(int sockfd)
    char * token;

    Send(sockfd, "f\n");
-    Recv(sockfd, buf); 
+    Recv(sockfd, buf);

-    if (strcmp(buf, "RPRT 1") == 0 ) 
+    if (strcmp(buf, "RPRT 1") == 0 )
        return freq;

-    token = strtok (buf, "\n"); 
-    freq = strtol (token, &ptr, 10); 
+    token = strtok (buf, "\n");
+    freq = strtol (token, &ptr, 10);
    // fprintf (stderr, "\nRIGCTL VFO Freq: [%ld]\n", freq);
    return freq;
 }
@@ -131,7 +130,7 @@ bool SetFreq(int sockfd, long int freq)
 {
    char buf[BUFSIZE];

-    sprintf (buf, "F %ld\n", freq); 
+    sprintf (buf, "F %ld\n", freq);
    Send(sockfd, buf);
    Recv(sockfd, buf);

@@ -141,7 +140,7 @@ bool SetFreq(int sockfd, long int freq)
    return true;
 }

-bool SetModulation(int sockfd, int bandwidth) 
+bool SetModulation(int sockfd, int bandwidth)
 {
    char buf[BUFSIZE];
    //the bandwidth is now a user/system based configurable variable
@@ -256,7 +255,7 @@ int UDPBind (char *hostname, int portno)
    serveraddr.sin_port = htons(portno);

    //Bind socket to listening
-    if (bind(sockfd, (struct sockaddr *) &serveraddr,  sizeof(serveraddr)) < 0) { 
+    if (bind(sockfd, (struct sockaddr *) &serveraddr,  sizeof(serveraddr)) < 0) {
 		perror("ERROR on binding UDP Port");
 	}

@@ -270,12 +269,12 @@ int UDPBind (char *hostname, int portno)
 }

 //going to leave this function available, even if completely switched over to rtl_dev_tune now, may be useful in the future
-void rtl_udp_tune(dsd_opts * opts, dsd_state * state, long int frequency) 
+void rtl_udp_tune(dsd_opts * opts, dsd_state * state, long int frequency)
 {
    UNUSED(state);

-    int handle; 
-    unsigned short udp_port = opts->rtl_udp_port; 
+    int handle;
+    unsigned short udp_port = opts->rtl_udp_port;
    char data[5] = {0}; //data buffer size is 5 for UDP frequency tuning
    struct sockaddr_in address;

@@ -324,18 +323,6 @@ void udp_socket_blaster(dsd_opts * opts, dsd_state * state, size_t nsam, void *
    if (err < nsam) fprintf (stderr, "\n UDP Underflow %ld", err); //I'm not even sure if this is possible
 }

-int m17_socket_receiver(dsd_opts * opts, void * data)
-{
-    size_t err = 0;
-    struct sockaddr_in cliaddr; 
-    socklen_t len = sizeof(cliaddr); 
-
-    //receive data from socket
-    err = recvfrom(opts->udp_sockfd, data, 1000, 0, (struct sockaddr * ) & address, &len); //was MSG_WAITALL, but that seems to be = 256
-
-    return err;
-}
-
 //Analog UDP port on +2 of normal open socket
 void udp_socket_blasterA(dsd_opts * opts, dsd_state * state, size_t nsam, void * data)
 {
@@ -353,20 +340,6 @@ void udp_socket_blasterA(dsd_opts * opts, dsd_state * state, size_t nsam, void *
    if (err < nsam) fprintf (stderr, "\n UDP Underflow %ld", err); //I'm not even sure if this is possible
 }

-int m17_socket_blaster(dsd_opts * opts, dsd_state * state, size_t nsam, void * data)
-{
-    UNUSED(state);
-    unsigned long long int err = 0;
-
-    //See notes in m17.c on line ~3395 regarding usage
-
-    //send audio or data to socket
-    err = sendto(opts->m17_udp_sock, data, nsam, 0, (const struct sockaddr * ) & addressM17, sizeof(struct sockaddr_in));
-    //RETURN Value should be ACKN or NACK, or PING, or PONG
-
-    return (err);
-}
-
 int udp_socket_connect(dsd_opts * opts, dsd_state * state)
 {
    UNUSED(state);
@@ -447,46 +420,6 @@ int udp_socket_connectA(dsd_opts * opts, dsd_state * state)
    return 0;
 }

-int udp_socket_connectM17(dsd_opts * opts, dsd_state * state)
-{
-    UNUSED(state);
-
-    long int err = 0;
-    err = opts->m17_udp_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if (err < 0)
-    {
-        fprintf (stderr, " UDP Socket Error %ld\n", err);
-        return (err);
-    }
-
-    // Don't think this is needed, but doesn't seem to hurt to keep it here either
-    int broadcastEnable = 1;
-    err = setsockopt(opts->m17_udp_sock, SOL_SOCKET, SO_BROADCAST, &broadcastEnable, sizeof(broadcastEnable));
-    if (err < 0)
-    {
-        fprintf (stderr, " UDP Broadcast Set Error %ld\n", err);
-        return (err);
-    }
-
-    memset((char * ) & addressM17, 0, sizeof(addressM17));
-    addressM17.sin_family = AF_INET;
-    err = addressM17.sin_addr.s_addr = inet_addr(opts->m17_hostname);
-    if (err < 0) //error in this context reports back 32-bit inet_addr reversed order byte pairs
-    {
-        fprintf (stderr, " UDP inet_addr Error %ld\n", err);
-        return (err);
-    }
-
-    addressM17.sin_port = htons(opts->m17_portno);
-    if (err < 0)
-    {
-        fprintf (stderr, " UDP htons Error %ld\n", err);
-        return (err);
-    }
-
-    return 0;
-}
-
 void return_to_cc (dsd_opts * opts, dsd_state * state)
 {
    //extra safeguards due to sync issues with NXDN
@@ -503,6 +436,8 @@ void return_to_cc (dsd_opts * opts, dsd_state * state)
    state->lasttgR = 0;
    state->lastsrc = 0;
    state->lastsrcR = 0;
+    state->gi[0] = -1;
+    state->gi[1] = -1;
    state->payload_algid = 0;
    state->payload_algidR = 0;
    state->payload_keyid = 0;
--- a/src/dsd_symbol.c
+++ b/src/dsd_symbol.c
@@ -117,12 +117,12 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
          {
            opts->audio_in_type = 0; //set input type
            openPulseInput(opts); //open pulse input
-          } 
+          }
          //else cleanup and exit
          else
          {
-            cleanupAndExit(opts, state);     
-          }        
+            cleanupAndExit(opts, state);
+          }
        }
      }
      else if (opts->audio_in_type == 3)
@@ -141,7 +141,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
      //tcp socket input from SDR++ -- now with 1 retry if connection is broken
      else if (opts->audio_in_type == 8)
      {
-        #ifdef AERO_BUILD
+        #ifdef __CYGWIN__
        result = sf_read_short(opts->tcp_file_in, &sample, 1);
        if(result == 0) {
          fprintf (stderr, "\nConnection to TCP Server Interrupted. Trying again in 3 seconds.\n");
@@ -150,7 +150,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
          sleep (3); //halt all processing and wait 3 seconds

          //attempt to reconnect to socket
-          opts->tcp_sockfd = 0;  
+          opts->tcp_sockfd = 0;
          opts->tcp_sockfd = Connect(opts->tcp_hostname, opts->tcp_portno);
          if (opts->tcp_sockfd != 0)
          {
@@ -168,7 +168,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
            }
            else fprintf (stderr, "TCP Socket Reconnected Successfully.\n");
          }
-          else fprintf (stderr, "TCP Socket Connection Error.\n");          
+          else fprintf (stderr, "TCP Socket Connection Error.\n");

          //now retry reading sample
          result = sf_read_short(opts->tcp_file_in, &sample, 1);
@@ -185,17 +185,17 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
              fprintf (stderr, "Opening Pulse Audio Input.\n");
              opts->audio_in_type = 0; //set input type
              openPulseInput(opts); //open pulse input
-            } 
+            }
            //else cleanup and exit
-            else 
+            else
            {
              fprintf (stderr, "Connection to TCP Server Disconnected.\n");
              fprintf (stderr, "Closing DSD-FME.\n");
              cleanupAndExit(opts, state);
            }
-            
+
          }
-          
+
        }
        #else
        result = sf_read_short(opts->tcp_file_in, &sample, 1);
@@ -208,7 +208,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
          sleep (3); //halt all processing and wait 3 seconds

          //attempt to reconnect to socket
-          opts->tcp_sockfd = 0;  
+          opts->tcp_sockfd = 0;
          opts->tcp_sockfd = Connect(opts->tcp_hostname, opts->tcp_portno);
          if (opts->tcp_sockfd != 0)
          {
@@ -242,14 +242,14 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
            sample = 0; //zero sample on bad result, keep the ball rolling
            fprintf (stderr, "Connection to TCP Server Disconnected.\n");
          }
-          
+
        }
        #endif
-        
+
      }

      //BUG REPORT: 1. DMR Simplex doesn't work with raw wav files. 2. Using the monitor w/ wav file saving may produce undecodable wav files.
-      //reworked a bit to allow raw audio wav file saving without the monitoring poriton active 
+      //reworked a bit to allow raw audio wav file saving without the monitoring poriton active
      if (have_sync == 0)
      {

@@ -264,7 +264,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
        if (state->analog_sample_counter > 959)
          state->analog_sample_counter = 959;

-        state->analog_out[state->analog_sample_counter++] = sample;    
+        state->analog_out[state->analog_sample_counter++] = sample;

        if (state->analog_sample_counter == 960)
        {
@@ -351,7 +351,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
        if (state->analog_sample_counter > 959)
          state->analog_sample_counter = 959;

-        state->analog_out[state->analog_sample_counter++] = sample; 
+        state->analog_out[state->analog_sample_counter++] = sample;

        if (state->analog_sample_counter == 960)
        {
@@ -371,19 +371,19 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)

      if (opts->use_cosine_filter)
        {
-          if ( (state->lastsynctype >= 10 && state->lastsynctype <= 13) || state->lastsynctype == 32 || state->lastsynctype == 33 
+          if ( (state->lastsynctype >= 10 && state->lastsynctype <= 13) || state->lastsynctype == 32 || state->lastsynctype == 33
                || state->lastsynctype == 34 || state->lastsynctype == 30 || state->lastsynctype == 31)
          {
            sample = dmr_filter(sample);
          }

-          else if (state->lastsynctype == 8 || state->lastsynctype == 9 || state->lastsynctype == 16 || state->lastsynctype == 17 || 
+          else if (state->lastsynctype == 8 || state->lastsynctype == 9 || state->lastsynctype == 16 || state->lastsynctype == 17 ||
                   state->lastsynctype == 86 || state->lastsynctype == 87 || state->lastsynctype == 98 || state->lastsynctype == 99)
          {
            sample = m17_filter(sample);
          }

-          else if ( 
+          else if (
               state->lastsynctype == 20 || state->lastsynctype == 21 ||
               state->lastsynctype == 22 || state->lastsynctype == 23 ||
               state->lastsynctype == 24 || state->lastsynctype == 25 ||
@@ -510,7 +510,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
          if (state->rf_mod == 0)
            {
              // 0: C4FM modulation
- 
+
              //EXPERIMENTAL: manipulate the left edge depending on sync type
              //TODO: See if we can manipulate this a bit more based on AFC or similar type function
              int l_edge = 2;
@@ -572,7 +572,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
              //is my original consclusion back when I was working on it last, unsure
              //or the best course on that, could just be a rtl_fm flaw
              //P25 may also work better at 16 as well now, hard to tell the difference since both are good
-              //DMR may not be any different on 12 or 16 
+              //DMR may not be any different on 12 or 16
              //most likely though, this all will just depend on signal stregth more than anything
              //as to how much BW you should set

@@ -627,13 +627,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
  }
 #endif

-  //test throttle on wav input files
-	if (opts->audio_in_type == 2)
-	{
-		if (state->use_throttle == 1) usleep(.003); //very environment specific, tuning to cygwin
-	}
-
-  //read op25/fme symbol bin files
+  //read dibit capture bin files
  if (opts->audio_in_type == 4)
  {
    //use fopen and read in a symbol, check op25 for clues
@@ -645,13 +639,6 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)

    state->symbolc = fgetc(opts->symbolfile);

-    //experimental throttle
-    if (state->use_throttle == 1)
-    {
-      // useconds_t stime = state->symbol_throttle;
-      // usleep(stime);
-      usleep(.003); //very environment specific, tuning to cygwin
-    }
    //fprintf(stderr, "%d", state->symbolc);
    if( feof(opts->symbolfile) )
    {
@@ -670,7 +657,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
      {
        opts->audio_in_type = 0; //set input type
        openPulseInput(opts); //open pulse input
-      } 
+      }
      //else cleanup and exit
      else
      {
@@ -682,11 +669,11 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
    if (state->rf_mod == 2) //GFSK
    {
      symbol = state->symbolc;
-      if (state->symbolc == 0 ) 
+      if (state->symbolc == 0 )
      {
        symbol = -3; //-1
      }
-      if (state->symbolc == 1 ) 
+      if (state->symbolc == 1 )
      {
        symbol = -1; //-3
      }
@@ -713,6 +700,16 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)

  }

+  //.raw or .sym float symbol files
+  if (opts->audio_in_type == 44)
+  {
+    float float_symbol = 0.0f;
+    fread (&float_symbol, sizeof(float), 1, opts->symbolfile); //sizeof(float) is 4 (usually)
+    if ( feof(opts->symbolfile) ) exitflag = 1; //end of file, exit
+    // float_symbol = -float_symbol; //inversion
+    symbol = (int)float_symbol * (int)10000;
+  }
+
  state->symbolcnt++;
  return (symbol);
 }
--- a/src/dsd_time.c
+++ b/src/dsd_time.c
@@ -60,6 +60,16 @@ char * getDateH()
  return curr;
 }

+//get YYYY/MM/DD with forward slash (LRRP files)
+char * getDateS()
+{
+  char * curr = calloc(27, sizeof(char));
+  time_t t = time(NULL);
+  struct tm * ptm = localtime(& t);
+  sprintf(curr, "%04d/%02d/%02d", ptm->tm_year+1900, ptm->tm_mon+1, ptm->tm_mday);
+  return curr;
+}
+
 //get YYYY-MM-DD with hyphen (Ncurses Call History)
 char * getDateN(time_t t)
 {
@@ -69,3 +79,20 @@ char * getDateN(time_t t)
  return curr;
 }

+//get HHmmss timestamp no colon (file operations)
+char * getTimeF(time_t t)
+{
+  char * curr = calloc(7, sizeof(char));
+  struct tm * ptm = localtime(& t);
+  sprintf(curr,"%02d%02d%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
+  return curr;
+}
+
+//get YYYYMMDD without hyphen (file operations)
+char * getDateF(time_t t)
+{
+  char * curr = calloc(25, sizeof(char));
+  struct tm * ptm = localtime(& t);
+  sprintf(curr,"%04d%02d%02d", ptm->tm_year+1900, ptm->tm_mon+1, ptm->tm_mday);
+  return curr;
+}
--- a/src/dsd_upsample.c
+++ b/src/dsd_upsample.c
@@ -2,8 +2,8 @@
 * dsd_upsample.c
 * Simplified 8k to 48k Upsample Functions
 * Goodbye terrible ringing sound
- * 
- * 
+ *
+ *
 *
 * LWVMOBILE
 * 2024-03 DSD-FME Florida Man Edition
--- a/src/dstar.c
+++ b/src/dstar.c
@@ -49,6 +49,10 @@ void processDSTAR(dsd_opts * opts, dsd_state * state)
    if (opts->use_ncurses_terminal == 1)
      ncursesPrinter(opts, state);

+    //slot 1
+    watchdog_event_history(opts, state, 0);
+    watchdog_event_current(opts, state, 0);
+
  }

  fprintf (stderr, "\n");
@@ -70,7 +74,7 @@ void processDSTAR_HD(dsd_opts * opts, dsd_state * state)
 }

 //first 24-bits of the larger scramble table
-uint8_t sd_d[48] = 
+uint8_t sd_d[48] =
 {0,0,0,0, //0
 1,1,1,0, //E
 1,1,1,1, //F
@@ -275,7 +279,7 @@ void processDSTAR_SD(dsd_opts * opts, dsd_state * state, uint8_t * sd)
        if (start == -1)
          goto SKIP;

-        //debug 
+        //debug
        // fprintf (stderr, "S: %d; ", start); //38, or 39

        //LAT
@@ -334,6 +338,8 @@ void processDSTAR_SD(dsd_opts * opts, dsd_state * state, uint8_t * sd)

        //this seems to work okay with a few samples, but wouldn't be surprised if it broke down
        //randomly on different users, depending on location and what else in in $$CRC
+
+        sprintf (state->event_history_s[0].Event_History_Items[0].gps_s, "%s", state->dstar_gps);
      }
      else
      {
@@ -351,6 +357,7 @@ void processDSTAR_SD(dsd_opts * opts, dsd_state * state, uint8_t * sd)
        }
        strt[59] = '\0';
        memcpy (state->dstar_txt, strt, sizeof(strt));
+        sprintf (state->event_history_s[0].Event_History_Items[0].text_message, "%s", state->dstar_txt);
      }
    }

@@ -370,6 +377,7 @@ void processDSTAR_SD(dsd_opts * opts, dsd_state * state, uint8_t * sd)
      }
      strt[59] = '\0';
      memcpy (state->dstar_txt, strt, sizeof(strt));
+      sprintf (state->event_history_s[0].Event_History_Items[0].text_message, "%s", state->dstar_txt);
    }
    //anything else
    else //print entire thing
@@ -377,7 +385,7 @@ void processDSTAR_SD(dsd_opts * opts, dsd_state * state, uint8_t * sd)
      fprintf (stderr, " _UNK:");
      fprintf (stderr, " %s", strf);
      // memcpy (state->dstar_txt, strf, sizeof(strf)); //don't copy the unknown garbo strings
-    } 
+    }

  }

--- a/src/edacs-bch3.c
+++ b/src/edacs-bch3.c
@@ -6,7 +6,7 @@
 * Mod:     December 14, 2021, for EDACS-FM BCH Polynomial Error Generation and Detection
 * Mod2:    October 2022, for DSD-FME port of EDACS-FM
 * Source:  www.eccpage.com
- * 
+ *
 * ===============  Encoder/Decoder for binary BCH codes in C =================
 *
 * Version 1:   Original program. The user provides the generator polynomial
@@ -30,7 +30,7 @@
 * previous version of the BCH encoder/decoder in C, 'bch2.c', was written by
 * Robert Morelos-Zaragoza (robert@spectra.eng.hawaii.edu) on 5/19/92.
 *
- * NOTE:    
+ * NOTE:
 *          The author is not responsible for any malfunctioning of
 *          this program, nor for any damage caused by it. Please include the
 *          original program along with these comments in any redistribution.
@@ -45,14 +45,14 @@
 *                    email: r.morelos-zaragoza@ieee.org
 *
 * COPYRIGHT NOTICE: This computer program is free for non-commercial purposes.
- * You may implement this program for any non-commercial application. You may 
+ * You may implement this program for any non-commercial application. You may
 * also implement this program for commercial purposes, provided that you
 * obtain my written permission. Any modification of this program is covered
 * by this copyright.
 *
 * == Copyright (c) 1994-7,  Robert Morelos-Zaragoza. All rights reserved.  ==
 *
- * m = order of the Galois field GF(2**m) 
+ * m = order of the Galois field GF(2**m)
 * n = 2**m - 1 = size of the multiplicative group of GF(2**m)
 * length = length of the BCH code
 * t = error correcting capability (max. no. of errors the code corrects)
@@ -60,14 +60,14 @@
 * k = n - deg(g(x)) = dimension (no. of information bits/codeword) of the code
 * p[] = coefficients of a primitive polynomial used to generate GF(2**m)
 * g[] = coefficients of the generator polynomial, g(x)
- * alpha_to [] = log table of GF(2**m) 
+ * alpha_to [] = log table of GF(2**m)
 * index_of[] = antilog table of GF(2**m)
 * ddata[] = information bits = coefficients of data polynomial, i(x)
 * bb[] = coefficients of redundancy polynomial x^(length-k) i(x) modulo g(x)
- * numerr = number of errors 
- * errpos[] = error positions 
- * recd[] = coefficients of the received polynomial 
- * decerror = number of decoding errors (in _message_ positions) 
+ * numerr = number of errors
+ * errpos[] = error positions
+ * recd[] = coefficients of the received polynomial
+ * decerror = number of decoding errors (in _message_ positions)
 *
 */

@@ -83,7 +83,7 @@ int             seed;
 int             numerr, errpos[1024], decerror = 0;


-void 
+void
 read_p()
 /*
 *	Read m, the degree of a primitive polynomial p(x) used to compute the
@@ -126,7 +126,7 @@ read_p()
        }
 	n = n / 2 - 1;
 	ninf = (n + 1) / 2 - 1;
-	
+
 	do  {

 		length = 40;
@@ -134,7 +134,7 @@ read_p()
 }


-void 
+void
 generate_gf()
 /*
 * Generate field GF(2**m) from the irreducible polynomial p(X) with
@@ -144,7 +144,7 @@ generate_gf()
 *   index->polynomial form: alpha_to[] contains j=alpha^i;
 *   polynomial form -> index form:	index_of[j=alpha^i] = i
 *
- * alpha=2 is the primitive element of GF(2**m) 
+ * alpha=2 is the primitive element of GF(2**m)
 */
 {
 	register int    i, mask;
@@ -171,7 +171,7 @@ generate_gf()
 }


-void 
+void
 gen_poly()
 /*
 * Compute the generator polynomial of a binary BCH code. Fist generate the
@@ -209,7 +209,7 @@ gen_poly()
 		do {
 			ll++;
 			test = 0;
-			for (ii = 1; ((ii <= jj) && (!test)); ii++)	
+			for (ii = 1; ((ii <= jj) && (!test)); ii++)
 			/* Examine previous cycle sets */
 			  for (kaux = 0; ((kaux < size[ii]) && (!test)); kaux++)
 			     if (ll == cycle[ii][kaux])
@@ -274,7 +274,7 @@ gen_poly()
 }


-void 
+void
 encode_bch()
 /*
 * Compute redundacy bb[], the coefficients of b(x). The redundancy
@@ -305,7 +305,7 @@ encode_bch()
 }


-void 
+void
 decode_bch()
 /*
 * Simon Rockliff's implementation of Berlekamp's algorithm.
@@ -361,7 +361,7 @@ decode_bch()
 		 * u='mu'+1 and 'mu' (the Greek letter!) is the step number
 		 * ranging from -1 to 2*t (see L&C),  l[u] is the degree of
 		 * the elp at that step, and u_l[u] is the difference between
-		 * the step number and the degree of the elp. 
+		 * the step number and the degree of the elp.
 		 */
 		/* initialise table entries */
 		d[0] = 0;			/* index form */
@@ -377,7 +377,7 @@ decode_bch()
 		u_lu[0] = -1;
 		u_lu[1] = 0;
 		u = 0;
- 
+
 		do {
 			u++;
 			if (d[u] == -1) {
@@ -389,7 +389,7 @@ decode_bch()
 			} else
 				/*
 				 * search for words with greatest u_lu[q] for
-				 * which d[q]!=0 
+				 * which d[q]!=0
 				 */
 			{
 				q = u - 1;
@@ -404,23 +404,23 @@ decode_bch()
 				      q = j;
 				  } while (j > 0);
 				}
- 
+
 				/*
 				 * have now found q such that d[u]!=0 and
-				 * u_lu[q] is maximum 
+				 * u_lu[q] is maximum
 				 */
 				/* store degree of new elp polynomial */
 				if (l[u] > l[q] + u - q)
 					l[u + 1] = l[u];
 				else
 					l[u + 1] = l[q] + u - q;
- 
+
 				/* form new elp(x) */
 				for (i = 0; i < t2; i++)
 					elp[u + 1][i] = 0;
 				for (i = 0; i <= l[q]; i++)
 					if (elp[q][i] != -1)
-						elp[u + 1][i + u - q] = 
+						elp[u + 1][i + u - q] =
                                   alpha_to[(d[u] + n - d[q] + elp[q][i]) % n];
 				for (i = 0; i <= l[u]; i++) {
 					elp[u + 1][i] ^= elp[u][i];
@@ -428,9 +428,9 @@ decode_bch()
 				}
 			}
 			u_lu[u + 1] = u - l[u + 1];
- 
+
 			/* form (u+1)th discrepancy */
-			if (u < t2) {	
+			if (u < t2) {
 			/* no discrepancy computed on last iteration */
 			  if (s[u + 1] != -1)
 			    d[u + 1] = alpha_to[s[u + 1]];
@@ -441,10 +441,10 @@ decode_bch()
 			      d[u + 1] ^= alpha_to[(s[u + 1 - i]
 			                    + index_of[elp[u + 1][i]]) % n];
 			  /* put d[u+1] into index form */
-			  d[u + 1] = index_of[d[u + 1]];	
+			  d[u + 1] = index_of[d[u + 1]];
 			}
 		} while ((u < t2) && (l[u + 1] <= t));
- 
+
 		u++;
 		if (l[u] <= t) {/* Can correct errors */
 			/* put elp into index form */
@@ -472,7 +472,7 @@ decode_bch()
 				}
 			}

-			if (count == l[u])	
+			if (count == l[u])
 			/* no. roots = degree of elp hence <= t errors */
 				for (i = 0; i < l[u]; i++)
 					recd[loc[i]] ^= 1;
@@ -496,8 +496,8 @@ unsigned long long int edacs_bch (unsigned long long int message)
 	  for (i = 0; i < k; i++){
 		  ddata[i] = ( (message >> i) & 0x1 ); //loaded up backwards? or just outputs backwards?
 	  }
-	  
-	
+
+
 	encode_bch();           /* encode data */

 	/*
--- a/src/edacs-fme.c
+++ b/src/edacs-fme.c
@@ -21,6 +21,108 @@
 *-----------------------------------------------------------------------------*/
 #include "dsd.h"

+
+int isCustomAfsString(dsd_state * state) {
+  return state->edacs_a_bits != 4 || state->edacs_f_bits != 4 || state->edacs_s_bits != 3;
+}
+
+//Get the string length we need for an AFS string, math-style
+int getAfsStringLength(dsd_state * state) {
+  if (!isCustomAfsString(state))
+    return 6;
+
+  int length = 0;
+  length += (state->edacs_a_bits + 2) / 3;
+  length += (state->edacs_f_bits + 2) / 3;
+  length += (state->edacs_s_bits + 2) / 3;
+  length += 2; //colon separators
+
+  // This will be either 6 or 7
+  return length;
+}
+
+//Format the AFS string, Florida-style
+int getAfsString(dsd_state * state, char * buffer, int a, int f, int s) {
+  if (!isCustomAfsString(state))
+  {
+    sprintf(buffer, "%02d-%02d%01d", a, f, s);
+    return 6;
+  }
+
+  int printed_chars = 0;
+  switch (state->edacs_a_bits)
+  {
+    case 1:
+    case 2:
+    case 3:
+      sprintf(buffer, "%01d:", a);
+      printed_chars += 1;
+      break;
+    case 4:
+    case 5:
+    case 6:
+      sprintf(buffer, "%02d:", a);
+      printed_chars += 2;
+      break;
+    case 7:
+    case 8:
+    case 9:
+      sprintf(buffer, "%03d:", a);
+      printed_chars += 3;
+      break;
+  }
+
+  sprintf(buffer + printed_chars, ":");
+  printed_chars++;
+
+  switch (state->edacs_f_bits) {
+    case 1:
+    case 2:
+    case 3:
+      sprintf(buffer + printed_chars, "%01d", f);
+      printed_chars += 1;
+      break;
+    case 4:
+    case 5:
+    case 6:
+      sprintf(buffer + printed_chars, "%02d", f);
+      printed_chars += 2;
+      break;
+    case 7:
+    case 8:
+    case 9:
+      sprintf(buffer + printed_chars, "%03d", f);
+      printed_chars += 3;
+      break;
+  }
+
+  sprintf(buffer + printed_chars, ":");
+  printed_chars++;
+
+  switch (state->edacs_s_bits) {
+    case 1:
+    case 2:
+    case 3:
+      sprintf(buffer + printed_chars, "%01d", s);
+      printed_chars += 1;
+      break;
+    case 4:
+    case 5:
+    case 6:
+      sprintf(buffer + printed_chars, "%02d", s);
+      printed_chars += 2;
+      break;
+    case 7:
+    case 8:
+    case 9:
+      sprintf(buffer + printed_chars, "%03d", s);
+      printed_chars += 3;
+      break;
+  }
+
+  return printed_chars;
+}
+
 char * getLcnStatusString(int lcn)
 {
  if (lcn == 26 || lcn == 27)
@@ -73,22 +175,6 @@ unsigned long long int edacsVoteFr(unsigned long long int fr_1_4, unsigned long
  return msg_result & 0xFFFFFFFFFF;
 }

-void openWavOutFile48k (dsd_opts * opts, dsd_state * state)
-{
-  UNUSED(state);
-  SF_INFO info;
-  info.samplerate = 48000; //48k for analog output (has to match input)
-  info.channels = 1;
-  info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16 | SF_ENDIAN_LITTLE;
-  opts->wav_out_f = sf_open (opts->wav_out_file, SFM_RDWR, &info);
-
-  if (opts->wav_out_f == NULL)
-  {
-    fprintf (stderr,"Error - could not open wav output file %s\n", opts->wav_out_file);
-    return;
-  }
-}
-
 //listening to and playing back analog audio
 void edacs_analog(dsd_opts * opts, dsd_state * state, int afs, unsigned char lcn)
 {
@@ -375,12 +461,38 @@ void edacs_analog(dsd_opts * opts, dsd_state * state, int afs, unsigned char lcn
      ncursesPrinter(opts, state);

    //write to wav file if opened
-    if (opts->wav_out_f != NULL)
+    if (opts->wav_out_f != NULL && opts->dmr_stereo_wav == 1) //Per Call
    {
      sf_write_short(opts->wav_out_f, analog1, 960);
      sf_write_short(opts->wav_out_f, analog2, 960);
      sf_write_short(opts->wav_out_f, analog3, 960);
    }
+    else if (opts->wav_out_f != NULL && opts->static_wav_file == 1) //Static Wav File
+    {
+      //downsample and stereo out (960 / 6 = 160; 160*2 = 320;)
+      short ss[320];
+      memset(ss, 0, sizeof(ss));
+      for (i = 0; i < 160; i++)
+      {
+        ss[(i*2)+0] = analog1[i*6]; //grab every 6th sample to downsample
+        ss[(i*2)+1] = analog1[i*6]; //grab every 6th sample to downsample
+      }
+      sf_write_short(opts->wav_out_f, ss, 320);
+      memset(ss, 0, sizeof(ss));
+      for (i = 0; i < 160; i++)
+      {
+        ss[(i*2)+0] = analog2[i*6]; //grab every 6th sample to downsample
+        ss[(i*2)+1] = analog2[i*6]; //grab every 6th sample to downsample
+      }
+      sf_write_short(opts->wav_out_f, ss, 320);
+      memset(ss, 0, sizeof(ss));
+      for (i = 0; i < 160; i++)
+      {
+        ss[(i*2)+0] = analog3[i*6]; //grab every 6th sample to downsample
+        ss[(i*2)+1] = analog3[i*6]; //grab every 6th sample to downsample
+      }
+      sf_write_short(opts->wav_out_f, ss, 320);
+    }

    //debug
    // fprintf (stderr, " SR: %016llX", sr);
@@ -417,6 +529,7 @@ void edacs_analog(dsd_opts * opts, dsd_state * state, int afs, unsigned char lcn
    if (count > 0) fprintf (stderr, "\n");

  }
+
 }

 void edacs(dsd_opts * opts, dsd_state * state)
@@ -455,6 +568,11 @@ void edacs(dsd_opts * opts, dsd_state * state)
    edacs_bit[i] = getDibit (opts, state); //getDibit returns binary 0 or 1 on GFSK signal (Edacs and PV)
  }

+  //if we have executed a tune to a channel, then we will forego decoding any more edacs until we return from the voice channel
+  //this is a simple quick and dirty solution to fix setting the lastsrc value to something that we don't want in event history
+  if (opts->p25_is_tuned == 1)
+    goto EDACS_END;
+
  //Each EDACS outbound frame consists of two 40-bit (28-bit data, 12-bit BCH) messages. Each message is sent three
  //times, with the middle message bitwise-inverted. We use unsigned long long int here to be safe in 32-bit cygwin (not
  //sure if this was actually an issue).
@@ -645,6 +763,9 @@ void edacs(dsd_opts * opts, dsd_state * state)
            }
            fprintf (stderr, " :: System ID [%04X] CC LCN [%02d]%s", system, state->edacs_cc_lcn, getLcnStatusString(lcn));

+            if (system != 0)
+              state->edacs_sys_id = system;
+
            //check for control channel lcn frequency if not provided in channel map or in the lcn list
            if (state->trunk_lcn_freq[state->edacs_cc_lcn-1] == 0)
            {
@@ -681,6 +802,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
          fprintf (stderr, " Extended Addressing :: Site ID [%02llX][%03lld] Area [%02X][%03d]", site_id, site_id, area, area);
          fprintf (stderr, "%s", KNRM);
          state->edacs_site_id = site_id;
+          state->edacs_area_code = area;
        }
        //System Dynamic Regroup Plan Bitmap
        else if (mt2 == 0xB)
@@ -812,7 +934,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
          //Ilya, please don't nit fix my logging format for these, it breaks grep when parsing a bunch of these all at once
          fprintf (stderr, "%s", KWHT);
          fprintf (stderr, " System Dynamic Regroup :: SP-WGID: %03d; Target: %07d;", sgid, target);
-          
+
          if (sgid != target)
          {
            //decode potential TGA values (assumming same as Harris P25)
@@ -833,7 +955,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
              fprintf (stderr, " UNK2: %02X;", unk2);
            fprintf (stderr, " SSN: %02X;", ssn); //this may or may not be a unique value to each SGID, is 1F for termination of a patch
          }
-          
+
          //07:25:17 Sync: +EDACS  MSG_1 [FE00045] MSG_2 [FE00045] (MT1: 1F; MT2: C)  System Dynamic Regroup :: SP-WGID: 069; Target: 0000069; One-Way Group Patch Delete TGA: 6;
          //Upon Reflection, thinking the same MT1 and MT2 values are in both messages, so appears to just be the SP-WGID here and a bunch of zeroes leading into it, and not a TGA value

@@ -958,6 +1080,9 @@ void edacs(dsd_opts * opts, dsd_state * state)
          }
        }

+        //debug for analog testing
+        // is_digital = 0;
+
        //TG hold on EDACS EA -- block non-matching target, allow matching group
        if (state->tg_hold != 0 && state->tg_hold != group) sprintf (mode, "%s", "B");
        if (state->tg_hold != 0 && state->tg_hold == group) sprintf (mode, "%s", "A");
@@ -970,11 +1095,12 @@ void edacs(dsd_opts * opts, dsd_state * state)
            //openwav file and do per call right here, should probably check as well to make sure we have a valid trunking method active (rigctl, rtl)
            if (opts->dmr_stereo_wav == 1 && (opts->use_rigctl == 1 || opts->audio_in_type == 3))
            {
-              sprintf (opts->wav_out_file, "./WAV/%s %s EDACS Site %lld TG %d SRC %d.wav", datestr, timestr, state->edacs_site_id, group, source);
-              if (is_digital == 1)
-                openWavOutFile (opts, state);
-              else
-                openWavOutFile48k (opts, state);
+              if (is_digital == 1) {} //just write to already open temp file to be renamed later
+              else //close the temp 8k wav file and open as 48k
+              {
+                opts->wav_out_f = close_and_rename_wav_file(opts->wav_out_f, opts->wav_out_file, opts->wav_out_dir, &state->event_history_s[0]);
+                opts->wav_out_f = open_wav_file(opts->wav_out_dir, opts->wav_out_file, 48000, 0);
+              }
            }

            //do condition here, in future, will allow us to use tuning methods as well, or rtl_udp as well
@@ -1085,11 +1211,12 @@ void edacs(dsd_opts * opts, dsd_state * state)
            //openwav file and do per call right here, should probably check as well to make sure we have a valid trunking method active (rigctl, rtl)
            if (opts->dmr_stereo_wav == 1 && (opts->use_rigctl == 1 || opts->audio_in_type == 3))
            {
-              sprintf (opts->wav_out_file, "./WAV/%s %s EDACS Site %lld TGT %d SRC %d I-Call.wav", datestr, timestr, state->edacs_site_id, target, source);
-              if (is_digital == 1)
-                openWavOutFile (opts, state);
-              else
-                openWavOutFile48k (opts, state);
+              if (is_digital == 1) {} //just write to already open temp file to be renamed later
+              else //close the temp 8k wav file and open as 48k
+              {
+                opts->wav_out_f = close_and_rename_wav_file(opts->wav_out_f, opts->wav_out_file, opts->wav_out_dir, &state->event_history_s[0]);
+                opts->wav_out_f = open_wav_file(opts->wav_out_dir, opts->wav_out_file, 48000, 0);
+              }
            }

            //do condition here, in future, will allow us to use tuning methods as well, or rtl_udp as well
@@ -1191,11 +1318,12 @@ void edacs(dsd_opts * opts, dsd_state * state)
            //openwav file and do per call right here, should probably check as well to make sure we have a valid trunking method active (rigctl, rtl)
            if (opts->dmr_stereo_wav == 1 && (opts->use_rigctl == 1 || opts->audio_in_type == 3))
            {
-              sprintf (opts->wav_out_file, "./WAV/%s %s EDACS Site %lld SRC %d All-Call.wav", datestr, timestr, state->edacs_site_id, source);
-              if (is_digital == 1)
-                openWavOutFile (opts, state);
-              else
-                openWavOutFile48k (opts, state);
+              if (is_digital == 1) {} //just write to already open temp file to be renamed later
+              else //close the temp 8k wav file and open as 48k
+              {
+                opts->wav_out_f = close_and_rename_wav_file(opts->wav_out_f, opts->wav_out_file, opts->wav_out_dir, &state->event_history_s[0]);
+                opts->wav_out_f = open_wav_file(opts->wav_out_dir, opts->wav_out_file, 48000, 0);
+              }
            }

            //do condition here, in future, will allow us to use tuning methods as well, or rtl_udp as well
@@ -1370,9 +1498,12 @@ void edacs(dsd_opts * opts, dsd_state * state)
            //openwav file and do per call right here
            if (opts->dmr_stereo_wav == 1 && (opts->use_rigctl == 1 || opts->audio_in_type == 3))
            {
-              sprintf (opts->wav_out_file, "./WAV/%s %s EDACS Site %lld TG %04d SRC %05d.wav", datestr, timestr, state->edacs_site_id, group, lid);
-              if (is_digital == 0) openWavOutFile48k (opts, state); //analog at 48k
-              else                 openWavOutFile (opts, state); //digital
+              if (is_digital == 1) {} //just write to already open temp file to be renamed later
+              else //close the temp 8k wav file and open as 48k
+              {
+                opts->wav_out_f = close_and_rename_wav_file(opts->wav_out_f, opts->wav_out_file, opts->wav_out_dir, &state->event_history_s[0]);
+                opts->wav_out_f = open_wav_file(opts->wav_out_dir, opts->wav_out_file, 48000, 0);
+              }
            }

            if (opts->use_rigctl == 1)
@@ -1436,7 +1567,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
        //Call info for state
        if (lcn != 0){state->edacs_vc_lcn = lcn;}
                      state->lasttg = target;
-                      state->lastsrc = 0;
+                      state->lastsrc = 0x800;

        //Call type for state
        if (is_individual_call == 0) state->edacs_vc_call_type = EDACS_IS_GROUP;
@@ -1570,7 +1701,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
          if (lcn != 0){state->edacs_vc_lcn = lcn;}
                        state->lasttg = target;
                        //Alas, EDACS standard does not provide a source LID on channel updates - try to work around this on the display end instead
-                        state->lastsrc = 0;
+                        state->lastsrc = 0x800;

          //Call type for state
                                      state->edacs_vc_call_type  = EDACS_IS_VOICE;
@@ -1623,10 +1754,12 @@ void edacs(dsd_opts * opts, dsd_state * state)
              //openwav file and do per call right here
              if (opts->dmr_stereo_wav == 1 && (opts->use_rigctl == 1 || opts->audio_in_type == 3))
              {
-                if (is_individual == 0) sprintf (opts->wav_out_file, "./WAV/%s %s EDACS Site %lld TG %04d SRC %05d.wav", datestr, timestr, state->edacs_site_id, target, state->lastsrc);
-                else                    sprintf (opts->wav_out_file, "./WAV/%s %s EDACS Site %lld TGT %05d SRC %05d I-Call.wav", datestr, timestr, state->edacs_site_id, target, state->lastsrc);
-                if (is_digital == 0) openWavOutFile48k (opts, state); //analog at 48k
-                else                 openWavOutFile (opts, state); //digital
+                if (is_digital == 1) {} //just write to already open temp file to be renamed later
+                else //close the temp 8k wav file and open as 48k
+                {
+                  opts->wav_out_f = close_and_rename_wav_file(opts->wav_out_f, opts->wav_out_file, opts->wav_out_dir, &state->event_history_s[0]);
+                  opts->wav_out_f = open_wav_file(opts->wav_out_dir, opts->wav_out_file, 48000, 0);
+                }
              }

              if (opts->use_rigctl == 1)
@@ -1734,9 +1867,12 @@ void edacs(dsd_opts * opts, dsd_state * state)
              //openwav file and do per call right here
              if (opts->dmr_stereo_wav == 1 && (opts->use_rigctl == 1 || opts->audio_in_type == 3))
              {
-                sprintf (opts->wav_out_file, "./WAV/%s %s EDACS Site %lld TGT %05d SRC %05d I-Call.wav", datestr, timestr, state->edacs_site_id, target, state->lastsrc);
-                if (is_digital == 0) openWavOutFile48k (opts, state); //analog at 48k
-                else                 openWavOutFile (opts, state); //digital
+                if (is_digital == 1) {} //just write to already open temp file to be renamed later
+                else //close the temp 8k wav file and open as 48k
+                {
+                  opts->wav_out_f = close_and_rename_wav_file(opts->wav_out_f, opts->wav_out_file, opts->wav_out_dir, &state->event_history_s[0]);
+                  opts->wav_out_f = open_wav_file(opts->wav_out_dir, opts->wav_out_file, 48000, 0);
+                }
              }

              if (opts->use_rigctl == 1)
@@ -2027,9 +2163,12 @@ void edacs(dsd_opts * opts, dsd_state * state)
                //openwav file and do per call right here
                if (opts->dmr_stereo_wav == 1 && (opts->use_rigctl == 1 || opts->audio_in_type == 3))
                {
-                  sprintf (opts->wav_out_file, "./WAV/%s %s EDACS Site %lld SRC %05d All-Call.wav", datestr, timestr, state->edacs_site_id, state->lastsrc);
-                  if (is_digital == 0) openWavOutFile48k (opts, state); //analog at 48k
-                  else                 openWavOutFile (opts, state); //digital
+                  if (is_digital == 1) {} //just write to already open temp file to be renamed later
+                  else //close the temp 8k wav file and open as 48k
+                  {
+                    opts->wav_out_f = close_and_rename_wav_file(opts->wav_out_f, opts->wav_out_file, opts->wav_out_dir, &state->event_history_s[0]);
+                    opts->wav_out_f = open_wav_file(opts->wav_out_dir, opts->wav_out_file, 48000, 0);
+                  }
                }

                if (opts->use_rigctl == 1)
@@ -2135,6 +2274,7 @@ void edacs(dsd_opts * opts, dsd_state * state)

  }

+  EDACS_END:

  if (timestr != NULL)
  {
@@ -2146,9 +2286,12 @@ void edacs(dsd_opts * opts, dsd_state * state)
    free (datestr);
    datestr = NULL;
  }
-  
+
  fprintf (stderr, "\n");

+  //when on a CC, rotate the symbol out file every hour, if enabled
+  rotate_symbol_out_file(opts, state);
+
 }

 void eot_cc(dsd_opts * opts, dsd_state * state)
@@ -2156,6 +2299,23 @@ void eot_cc(dsd_opts * opts, dsd_state * state)

  fprintf (stderr, "EOT; \n");

+  //skip an arbitrary number of dibits so that the CC can cancel the grant after a dotting sequence
+  //prior to returning to the control channel and getting sent in a loopback to the call channel
+  skipDibit(opts, state, 240*8);
+
+  //watchdog event at this point
+  state->lastsynctype = 38; 
+  watchdog_event_history(opts, state, 0);
+  watchdog_event_current(opts, state, 0);
+
+  //close and rename wav file here, then open a new one
+  if (opts->dmr_stereo_wav == 1)
+  {
+    if (opts->wav_out_f != NULL)
+      opts->wav_out_f = close_and_rename_wav_file(opts->wav_out_f, opts->wav_out_file, opts->wav_out_dir, &state->event_history_s[0]);
+    opts->wav_out_f  = open_wav_file(opts->wav_out_dir, opts->wav_out_file, 8000, 0);
+  }
+
  //set here so that when returning to the CC, it doesn't go into an immediate hunt if not immediately acquired
  state->last_cc_sync_time = time(NULL);
  state->last_vc_sync_time = time(NULL);
--- a/src/ez.cpp
+++ b/src/ez.cpp
@@ -84,8 +84,8 @@ int ez_rs28_facch (int payload[156], int parity[114])
  int ec = -2;
  int i, j, k, b;

-  //init HB 
-  for (i = 0; i < 64; i++)
+  //init HB
+  for (i = 0; i < (int)HB.size(); i++)
  {
 	HB[i] = 0;
  }
@@ -136,7 +136,7 @@ int ez_rs28_sacch (int payload[180], int parity[132])
  int i, j, k, b;

  //init HBS
-  for (i = 0; i < 64; i++)
+  for (i = 0; i < (int)HBS.size(); i++)
  {
 	HBS[i] = 0;
  }
@@ -338,7 +338,7 @@ int isch_lookup (uint64_t isch)
 	}
 	else  // No errors, so simply return the matching value
 		decoded = isch_map[isch];
-		
+
 	return decoded;

 }
--- a/src/ezpwd/asserter
+++ b/src/ezpwd/asserter
@@ -28,10 +28,10 @@ namespace ezpwd {
 	    ;
 	}

-	// 
+	//
 	// output( <std::ostream> )		-- Output description of last failed test (or nothing if successful)
 	// <std::ostream> << <asserter>
-	// 
+	//
 	std::ostream  	       &output(
 				    std::ostream       &lhs )
 	    const
@@ -39,14 +39,14 @@ namespace ezpwd {
 	    return lhs << out;
 	}

-	// 
+	//
 	// (bool) <asserter> -- Return status of last test
 	//
    				operator bool()
 	{
 	    return failed;
 	}
-	
+
 	template < typename T >
 	asserter	       &istrue(  const char *file, int line, const T &a, const std::string &comment = std::string() )
 	{
@@ -84,7 +84,7 @@ namespace ezpwd {
 	    }
 	    return success();
 	}
-	
+
 	asserter	       &failure( const char *file, int line, const std::string &comparison,
 					 const std::string &comment = std::string() )
 	{
--- a/src/ezpwd/bch
+++ b/src/ezpwd/bch
@@ -1,6 +1,6 @@
 /*
 * Ezpwd Reed-Solomon -- Reed-Solomon encoder / decoder library
- * 
+ *
 * Copyright (c) 2017, Hard Consulting Corporation.
 *
 * Ezpwd Reed-Solomon is free software: you can redistribute it and/or modify it under the terms of
@@ -9,7 +9,7 @@
 * source tree.  Ezpwd Reed-Solomon is also available under Commercial license.  The Djelic BCH code
 * under djelic/ and the c++/ezpwd/bch_base wrapper is redistributed under the terms of the GPLv2+,
 * regardless of the overall licensing terms.
- * 
+ *
 * Ezpwd Reed-Solomon is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
 * the GNU General Public License for more details.
@@ -22,7 +22,7 @@
 #include "bch_base"

 namespace ezpwd {
-    // 
+    //
    // ezpwd::bch_base -- Interface to underlying Djelic Linux Kernel API
    // ezpwd::bch<SYMBOLS, CORRECTION> -- General BCH codec types; min. CORRECTION capacity, undefined PAYLOAD
    //
@@ -31,7 +31,7 @@ namespace ezpwd {
    // target bit-error correction capacity T.  They may correct more than T errors, and the number
    // of parity ECC bits will be selected by the algorithm.  You need to compute the maximum
    // non-parity payload by computing _bch->n - _bch->ecc_bits.
-    // 
+    //
    //     The data and parity bits must always be on separate blocks of int8_t/uint8_t-sized data
    // in the container.  This is required because the underlying API must break the data and parity
    // out as separate arrays for processing.  So, if the computed ecc_bits is not evenly divisible
@@ -39,12 +39,12 @@ namespace ezpwd {
    // the end of the supplied container.  Alternatively, it can be kept in a separate container.
    // This is probably safest, as the bch_base/bch/BCH classes will never attempt to resize the
    // data/parity containers when supplied separately.
-    // 
+    //
    //     Like the Reed-Solomon APIs, the bch_base/bch/BCH APIs will alter the size of a variable
    // container in encode(...), to add the BCH ECC "parity" data (eg. std::vector, std::string).
    // Fixed containers (eg. std::array) are never resized, and it is assumed that ecc_bytes of
    // parity data exist at the end of the container.
-    // 
+    //
    class bch_base {
    public:
 	ezpwd::bch_control     *_bch;
@@ -92,12 +92,12 @@ namespace ezpwd {
 	    return lhs << *this->_bch;
 	}

-	// 
+	//
 	// encode -- container interfaces
-	// 
+	//
 	//     Returns number of ECC *bits* initialized (to be consistent w/ decode, which returns
 	// number of bit errors corrected).
-	// 
+	//
 	int			encode(
 				    std::string	       &data )
 	    const
@@ -123,7 +123,7 @@ namespace ezpwd {
 	    return encode( cuTpair( (const uT *)&data.front(), (const uT *)&data.front() + data.size() ),
 			   uTpair( (uT *)&parity.front(), (uT *)&parity.front() + parity.size() ));
 	}
-	
+
 	template < typename T >
 	int			encode(
 				    std::vector<T>     &data )
@@ -167,11 +167,11 @@ namespace ezpwd {
 	    return encode( uTpair( (uT *)&data.front() + pad, (uT *)&data.front() + data.size() ));
 	}

-	
-	// 
+
+	//
 	// encode -- denote data+parity or data, parity using pairs of uint8_t iterators
 	// encode -- base implementation, in terms of uint8_t pointers
-	// 
+	//
 	virtual int		encode(
 				    const std::pair<uint8_t *, uint8_t *>
 						       &data )
@@ -206,9 +206,9 @@ namespace ezpwd {

 	//
 	// decode -- container interface, w/ optional corrected bit-error positions reported
-	// 
+	//
 	//     Does not correct errors in parity!
-	// 
+	//
 	int			decode(
 				    std::string	       &data,
 				    std::vector<int>   *position= 0 )
@@ -280,15 +280,15 @@ namespace ezpwd {
 			   position );
 	}

-	// 
+	//
 	// decode -- denote data+parity or data, parity using pairs of uint8_t iterators
 	// decode -- decode and correct BCH codeword, returning number of corrections, or -1 if failed
-	// 
+	//
 	//    Corrects data in-place (unlike the basic Djelic Linux Kernel API, which only returns
 	// error positions.  For consistency with ezpwd::rs..., we report all error positions as
 	// std::vector<int>, even though the underlying Djelic API reports them as arrays of
 	// unsigned int.
-	// 
+	//
 	virtual int		decode(
 				    const std::pair<uint8_t *, uint8_t *>
 						       &data,
@@ -329,18 +329,18 @@ namespace ezpwd {
 		position->resize( corrects );
 	    return corrects;
 	}
-	
+
 	//
 	// {en,de}coded -- returns an encoded/corrected copy of the provided container
 	//
 	// NOTE:
-	// 
+	//
 	//     Must return exceptions on failure; If exceptions inhibited, returns a
 	// default-constructed instance of the supplied data container.  This may be sufficient to
 	// reliably deduce failure; if not, this interface should not be used.
-	// 
+	//
 	//     Overloads decoded to also allow recovery of corrected error positions and count.
-	// 
+	//
 	template <typename C>
 	C			encoded(
 				    C			data )
@@ -391,11 +391,11 @@ namespace ezpwd {
 	}
    }; // class bch

-    // 
+    //
    // std::ostream << ezpwd::bch_base
-    // 
+    //
    //     Output a BCH codec description in standard form eg. BCH( 255, 239,   2 )
-    // 
+    //
    inline
    std::ostream	       &operator<<(
 				    std::ostream       &lhs,
@@ -405,9 +405,9 @@ namespace ezpwd {
 	return rhs.output( lhs );
    }

-    // 
+    //
    // ezpwd::BCH<SYMBOLS, PAYLOAD, CAPACITY> -- Standard BCH codec types
-    // 
+    //
    //     Specify and create a standard BCH codec with exactly the specified capacities.  We create
    // the undering BCH codec using SYMBOLS and CORRECTION capacity; the actual correction capacity
    // T, the number of PARITY bits and hence PAYLOAD (CAPACITY - PARITY) is selected automatically
@@ -415,11 +415,11 @@ namespace ezpwd {
    // caller *knows* all of these values at compile time, however, mostly for future optimization
    // purposes.  We validate them, and fail the constructor if they don't match.  See bch_test for
    // an enumeration of all possible BCH codecs.
-    // 
+    //
    //     In the future, this API may be re-implemented to not use the generic BCH API, but a more
    // optimized locally-defined implementation that leverages the fixed SYMBOLS, PAYLOAD and
    // CORRECTION capacities to produce more optimal code.
-    // 
+    //
    template < size_t SYMBOLS, size_t PAYLOAD, size_t CORRECTION >
    class BCH
 	: public bch<SYMBOLS, CORRECTION>
@@ -463,13 +463,13 @@ namespace ezpwd {
    }; // class BCH


-    // 
+    //
    // std::ostream << ezpwd::BCH<...>
-    // 
+    //
    //     Output a BCH codec description in standard form eg. BCH( 255, 239,   2 )
-    // 
+    //
    // NOTE: clang/gcc disagree on the scoping of operator<< template/non-template functions...
-    // 
+    //
    template <size_t SYMBOLS, size_t PAYLOAD, size_t CORRECTION>
    inline
    std::ostream	       &operator<<(
--- a/src/ezpwd/bch_base
+++ b/src/ezpwd/bch_base
@@ -1,6 +1,6 @@
 /*
 * Ezpwd Reed-Solomon -- Reed-Solomon encoder / decoder library
- * 
+ *
 * Copyright (c) 2017, Hard Consulting Corporation.
 *
 * Ezpwd Reed-Solomon is free software: you can redistribute it and/or modify it under the terms of
@@ -9,7 +9,7 @@
 * source tree.  Ezpwd Reed-Solomon is also available under Commercial license.  The Djelic BCH code
 * under djelic/ and the c++/ezpwd/bch_base wrapper is redistributed under the terms of the GPLv2+,
 * regardless of the overall licensing terms.
- * 
+ *
 * Ezpwd Reed-Solomon is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
 * the GNU General Public License for more details.
@@ -21,11 +21,11 @@
 #include <iomanip>
 #include <vector>

-// 
+//
 // Presently, we simply import the Linux Kernel's "C" BCH API directly into the ezpwd:: namespace In
 // order to compile, you must (at least) run "make djelic" in the base directory of the
 // https://github.com/pjkundert/bch.git repo.
-// 
+//
 namespace ezpwd {
    /**
     * struct bch_control - BCH control structure
@@ -152,21 +152,21 @@ namespace ezpwd {
 	#include "../../djelic_bch.h"
    }

-    // 
+    //
    // correct_bch -- corrects data (but not parity!), as suggested by decode_bch, above
-    // 
+    //
    //     A convenience interface that defaults all of the not strictly required parameters, and
    // automatically corrects bit-errors in data *and* the supplied parity.  Does not attempt to
    // correct bit errors found in the parity data.  If not supplied, 'errloc' is allocated
    // internally; otherwise, it is assumed to be of at least size bch->t (the minimum error
    // correction capacity of the BCH codec).
-    // 
+    //
    //     However, beware -- at larger values of T, the actual correction capacity of the BCH codec
    // could be greater than the requested T.  Therefore, it is recommended that you always supply a
    // larger than required errloc array; recommend T*2?
-    // 
+    //
    inline
-    int				correct_bch( 
+    int				correct_bch(
 				    struct bch_control *bch,
 				    uint8_t            *data,
 				    unsigned int	len,
@@ -198,9 +198,9 @@ namespace ezpwd {
 	return err;
    }

-    // 
+    //
    // <ostream> << <ezpwd::bch_control> -- output codec in standard BCH( N, N-ECC, T ) form
-    // 
+    //
    inline
    std::ostream	       &operator<<(
 				    std::ostream       &lhs,
--- a/src/ezpwd/corrector
+++ b/src/ezpwd/corrector
@@ -1,6 +1,6 @@
 /*
 * Ezpwd Reed-Solomon -- Reed-Solomon encoder / decoder library
- * 
+ *
 * Copyright (c) 2014, Hard Consulting Corporation.
 *
 * Ezpwd Reed-Solomon is free software: you can redistribute it and/or modify it under the terms of
@@ -8,7 +8,7 @@
 * the License, or (at your option) any later version.  See the LICENSE file at the top of the
 * source tree.  Ezpwd Reed-Solomon is also available under Commercial license.  c++/ezpwd/rs_base
 * is redistributed under the terms of the LGPL, regardless of the overall licensing terms.
- * 
+ *
 * Ezpwd Reed-Solomon is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
 * the GNU General Public License for more details.
@@ -21,7 +21,7 @@

 namespace ezpwd {

-    // 
+    //
    // best_avg -- collect <password>,<confidence> guesses, and return the unambiguous best one
    //
    typedef std::map<std::string, std::pair<int, int>> // (<password>, (<count>, <avgsum>))
@@ -38,9 +38,9 @@ namespace ezpwd {
        using best_avg_base_t::const_iterator;
        using best_avg_base_t::value_type;
        using best_avg_base_t::mapped_type;
-        // 
+        //
        // add -- add the given pct to the current average for <string> str
-        // 
+        //
        iterator		add(
 	    			    const std::string  &str,
 	    			    int			pct )
@@ -53,9 +53,9 @@ namespace ezpwd {
 	    return i;
        }

-        // 
+        //
        // best -- return the unambiguously best value (average is >, or == but longer), or end()
-        // 
+        //
        const_iterator		best()
 	    const
        {
@@ -76,11 +76,11 @@ namespace ezpwd {
 	    return uni ? top : end();
        }

-        // 
+        //
        // evaluation -- process a (<password>,(<count>,<avgsum>)) into (<average>,<password>)
        // sort -- return a multimap indexed by <average> --> <string>
        // output -- output the <string>: <average>, sorted by average
-        // 
+        //
        static std::pair<const int,const std::string &>
 				evaluation( const value_type &val )
        {
@@ -116,14 +116,14 @@ std::ostream		       &operator<<(
 }

 namespace ezpwd {
-    // 
+    //
    // ezpwd::corrector -- Apply statistical corrections to a string, returning the confidence
-    // 
+    //
    //     All methods are static; no instance is required, as this is primarily used to create
    // external language APIs.
-    // 
+    //
    template <
-	size_t			PARITY, 
+	size_t			PARITY,
 	size_t			N	= 64,
 	typename		SERIAL	= serialize::base< N, serialize::ezpwd< N >>>
    class corrector {
@@ -135,10 +135,10 @@ namespace ezpwd {
 	    lhs << "corrector<PARITY=" << PARITY << ",N=" << N << ",SERIAL=" << SERIAL() << ">";
 	    return lhs;
 	}
-				    
-	// 
+
+	//
 	// parity(<string>) -- Returns 'PARITY' base-N symbols of R-S parity to the supplied password
-	// 
+	//
 	static std::string	parity(
 				    const std::string  &password )
 	{
@@ -148,13 +148,13 @@ namespace ezpwd {
 	    return parity;
 	}

-	// 
+	//
 	// encode(<string>) -- append PARITY base-N parity symbols to password
-	// 
+	//
 	//     The supplied password buffer size must be sufficient to contain PARITY additional
 	// symbols, plus the terminating NUL.  Returns the resultant encoded password size
 	// (excluding the NUL).
-	// 
+	//
 	static size_t		encode(
 				    std::string        &password )
 	{
@@ -178,23 +178,23 @@ namespace ezpwd {
 	    return len;
 	}

-	// 
+	//
 	// decode(<string>[,...]) -- Applies R-S error correction on the encoded string, removing parity
-	// 
+	//
 	//     Up to 'PARITY' Reed-Solomon parity symbols are examined, to determine if the supplied
 	// string is a valid R-S codeword and hence very likely to be correct.  Optionally supply a
 	// vector of erasure positions.
-	// 
+	//
 	//     An optional 'minimum' final password length may be provided; no R-S parity is assumed
 	// to exist in the first 'minimum' password characters (default: PARITY).  This prevents
 	// accidentally finding valid R-S codewords in passwords of known minimum length; validation
 	// codes, for example.  Likewise, the optional 'maximum' allows us to limit the number of
 	// parity symbols that may be assumed to be missing from the end of the codeword.
-	// 
+	//
 	//     Returns a confidence strength rating, which is the ratio:
-	// 
+	//
 	//         100 - ( errors * 2 + erasures ) * 100 / parity
-	// 
+	//
 	// if an R-S codeword was solved, and 0 otherwise.  If a codeword is solved, but the number
 	// of errors and erasures corrected indicates that all parity was consumed, the caller may
 	// opt to not use the corrected string, because there is a chance that our R-S polynomial
@@ -204,26 +204,26 @@ namespace ezpwd {
 	// were used in error/erasure recover, with none left to confirm that the result is actually
 	// correct.  If only zero-strength results are achieved, the longest will be returned (the
 	// full, original string).
-	// 
+	//
 	//     Supports the following forms of error/erasure:
-	// 
+	//
 	// 0) Full parity.  All data and parity supplied, and an R-S codeword is solved.
-	// 
+	//
 	// 1) Partial parity.  All data and some parity supplied; remainder are deemed erasures.
-	// 
+	//
 	//     If PARITY > 2, then up to PARITY/2-1 trailing parity terms are marked as erasures.
 	// If the R-S codeword is solved and a safe number of errors are found, then we can have
 	// reasonable confidence that the string is correct.
-	// 
+	//
 	//   1a) Erase errors.  Permute the combinations of up to PARITY-1 erasures.
-	// 
+	//
 	// o) Raw password.  No parity terms supplied; not an R-S codeword
-	// 
+	//
 	//     If none of the error/erasure forms succeed, the password is returned unmodified.
-	// 
+	//
 	//     If a non-zero 'minimum' or 'maximum' are provided, they constrain the possible
 	// resultant password sizes that will be attempted.
-	// 
+	//
 	static
 	int			decode(
 				    std::string	       &password,
@@ -239,16 +239,16 @@ namespace ezpwd {
 	    // capability while maintaining at least one excess parity symbol for verification.
 	    // This can potentially result in longer password being returned, if the R-S decoder
 	    // accidentally solves a codeword.
-	    // 
+	    //
 	    // For example, if PARITY=3 (or 4) then (PARITY+1)/2 == 2, and we would only attempt up
 	    // to 1 parity erasure.  This would leave 1 parity symbol to replace the 1 erasure, and
 	    // 1 remaining to validate the integrity of the password.
-	    // 
+	    //
 	    // The password must be long enough to contain at least 1 non-parity symbol, and the
 	    // designated number of non-erased parity symbols!  However, by convention we'll demand
 	    // that the password contain at least PARITY symbols -- any less, and we can
 	    // accidentally correct the few remaining password symbols.
-	    // 
+	    //
 	    // Also, if any parity symbols won't decode (eg. were entered in error), we must deem
 	    // them to be erasures, too, and if the number of erasures exceeds the capacity of the
 	    // R-S codec, it'll fail (throw an exception, or at best solve with 0 confidence).
@@ -331,7 +331,7 @@ namespace ezpwd {
 			<< " parity erasures "		<< std::setw( 3 ) << confidence
 			<< "% confidence: \"" 		<< password
 			<< "\" ==> \""			<< fixed
-			<< "\" (corrects: "		<< corrects 
+			<< "\" (corrects: "		<< corrects
 			<< ", erasures at "		<< all_era
 			<< ", fixed at "		<< position << "): "
 			<< std::endl
@@ -354,7 +354,7 @@ namespace ezpwd {
 	    // w/ 3 parity: sock1tkeB
 	    // password ----^^^^^^
 	    //                    ^^^--- parity
-	    // 
+	    //
 	    for ( size_t era = (PARITY+1)/2 // how many parity symbols are not present
 		      ; era < PARITY
 		      ; ++era ) {
@@ -446,15 +446,15 @@ namespace ezpwd {
 	    return decode( password, std::vector<int>(), minimum, maximum );
 	}

-	// 
+	//
 	// decode(<char*>,<size_t>,<size_t>,<size_t>) -- C interface to decode(<string>)
-	// 
+	//
 	//     Traditional C interface.  The provided NUL-terminated password+parity is decoded
 	// (parity removed), and the confidence % is returned.
-	// 
+	//
 	//     If any failure occurs, a -'ve value will be returned, and the supplied password
 	// buffer will be used to contain an error description.
-	// 
+	//
 	static int		decode(
 				    char	       *password,	// NUL terminated
 				    size_t		siz,		// available size
@@ -477,13 +477,13 @@ namespace ezpwd {
 	    return confidence;
 	}

-	// 
+	//
 	// rscodec -- A ?-bit RS(N-1,N-1-PARITY) Reed-Solomon codec
-	// 
+	//
 	//     Encodes and decodes R-S symbols over the lower 6 bits of the supplied data.  Requires
 	// that the last N (parity) symbols of the data are in the range [0,63].  The excess bits on
 	// the data symbols are masked and restored during decoding.
-	// 
+	//
 	static const ezpwd::RS<N-1,N-1-PARITY>
 				rscodec;
    };
--- a/src/ezpwd/definitions
+++ b/src/ezpwd/definitions
@@ -1,6 +1,6 @@
-// 
+//
 // C++ Definitions -- include once in a single C++ compilation unit
-// 
+//
 #ifndef _EZPWD_DEFINITIONS
 #define _EZPWD_DEFINITIONS

--- a/src/ezpwd/ezcod
+++ b/src/ezpwd/ezcod
@@ -1,6 +1,6 @@
 /*
 * Ezpwd Reed-Solomon -- Reed-Solomon encoder / decoder library
- * 
+ *
 * Copyright (c) 2014, Hard Consulting Corporation.
 *
 * Ezpwd Reed-Solomon is free software: you can redistribute it and/or modify it under the terms of
@@ -8,7 +8,7 @@
 * the License, or (at your option) any later version.  See the LICENSE file at the top of the
 * source tree.  Ezpwd Reed-Solomon is also available under Commercial license.  c++/ezpwd/rs_base
 * is redistributed under the terms of the LGPL, regardless of the overall licensing terms.
- * 
+ *
 * Ezpwd Reed-Solomon is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
 * the GNU General Public License for more details.
@@ -25,9 +25,9 @@
 #include <ezpwd/output>
 #include <ezpwd/serialize>

-// 
+//
 // EZCOD 3:10 location code w/ Reed-Solomon Error Correction, and average 3m accuracy
-// 
+//
 // - each successive symbol provides greater precision
 //   - codes nearby each-other are identical in leading characters
 // - average 3m precision achieved in 9 symbols
@@ -37,87 +37,87 @@
 //   - 2 parity symbols provides correction of 1 lost symbol (no errors)
 //   - 3 parity symbols provides correction of any 1 error, with verification,
 //     or recovery of up to any 3 lost symbols (with no other errors)
-// 
+//

-// 
+//
 //     To achieve at least 4 decimal digits of precision after the decimal point, we must have
 // defined lat to within 1 part in 1,800,000, and lon to within 1 part in 3,600,000.  As each symbol
 // supplies bits, we'll refine the computed lat/lon further, reducing the outstanding fraction of
 // "parts" yet to be defined.
-// 
-//             bits      
+//
+//             bits
 //    symbols   latitude             longitude
 //              bits mul   parts      bits mul   parts
 //       1      2    4         4      3    8         8
 //       2      2    4        16      3    8        64
 //       3      3    8       128      2    4       256 // not quite integer lat/lon accuracy
-// 
+//
 //       4      2    4       512      3    8     2,048
 //       5      3    8     4,096      2    4     8,192
-//       6      2    4    16,384      3    8    65,536 
+//       6      2    4    16,384      3    8    65,536
 //
 //       7      3    8   131,072      2    4   262,144
 //       8      2    4   524,288      3    8 2,097,152
 //       9      3    8 4,194,304      2    4 8,388,608 parts resolution in  3:10 code
 //                over [-90, 90]       over [-180,180] yields ~3m resolution
-// 
+//
 //                 vs. 1,800,000             3,600,000 parts resolution in 10:10 code
 //                over [-90, 90]       over [-180,180] yields ~10m resolution
-// 
+//
 //     Therefore, within 9 symbols we define lat and lon with better than double the precision of
 // 10:10 code's 4 decimal digits after the decimal point.  This yields an approximate lineal
 // precision of 40,075,000m / 8,388,608 == ~5m in both dimensions at the equator, vs. 40,075,000m /
 // 3,600,000 == ~11m for 10:10 codes.
-// 
+//
 //     The 10:10 code provides a single check character, which provides about P(1-1/32) certainty
-// that the provided code is correct.  With EZCOD 3:10/11/12 codes, we provide varying levels of 
+// that the provided code is correct.  With EZCOD 3:10/11/12 codes, we provide varying levels of
 // detection/correction strength.
-// 
+//
 //   - 1 parity symbol: act as a check character (like 10:10 codes), or provide 1 symbol of erasure
 //     (lost symbol) recovery with no excess parity for validation.
-// 
+//
 //    - 2 parity symbols: provide 1 symbol of erasure correction (w/ no other errors) with 1 excess parity
 //      symbol for validation, or 1 symbol of error detection with no excess parity for validation.
-//             
+//
 //    - 3 parity symbols: correct 1 error anywhere w/ 1 excess parity symbol for validation, or up
 //      to 3 erasures with no excess parity for validation.
-// 
+//
 //     Therefore, we'll provide Reed-Solomon RS(31,28-30) error correction (5 bit symbols,
 // indicating 31 symbols in the field, and from 1 to 3 roots, therefore up to 28 data symbols in the
 // field) over the 9 lat/lon data symbols.
-// 
-// 
+//
+//
 // MINIMIZING ERROR
-// 
+//
 //     Each input lat/lon coordinate will be effectively truncated by the encoding procedure to the
 // level of precision (parts) encoded by each symbol.  Subsequent symbols then add their (smaller)
 // parts to increase precision.
-// 
+//
 //     After the last symbol, we know that the actual input coordinates where somewhere
 // within the rectangle:
-// 
+//
 //         [0,0] -> [0,lon_precision] -> [lat_precision,lon_precision] -> [lat_precision,0]
-// 
+//
 //     At first glance, the best way is to perform rounding instead of truncation on ecoding, by
 // simply adding 1/2 of the precision.  Then, the unmodified output lat/lon decoded represents the
 // point nearest actual input coordinate.  However, this is NOT ideal.  Remember -- the decoding may
 // not have access to all the symbols!  We want to minimize the error even if only some of the
 // symbols are available.  Thus, we must apply a correction on decoding.
-// 
+//
 //    One way gain rounding instead of truncation on decoding is, after adding the last symbol's
 // precision, to add 50% of the value represented by the first bit of the next (missing) symbol's
 // precision parts.  This would be analogous to receiving the first 2 digits of a 3 digit number:
-// 
+//
 //         original:  123
 //         received:  12_
 //         range:     [120,130)
 //         guessed:   125 (add 1/2 of the parts represented by the missing digit)
-// 
+//
 //     If this is done, then the resulting coordinate would be in the middle of the rectangle of
 // possible input lat/lon values that could have resulted in the encoded value.  This also works if
 // we don't receive and decode all of the symbols; We'll end up with a lat/lon in the middle of the
 // (large) rectangle of possible input coordinates.
-// 
+//


 namespace ezpwd {
@@ -179,9 +179,9 @@ inline std::ostream	       &operator<<(

 namespace ezpwd {

-    // 
+    //
    // ezcod<P,L> -- defaults to 1 PARITY and 9 location symbols (3m) of PRECISION
-    // 
+    //
    template < unsigned P=1, unsigned L=9 >
    class ezcod
 	: public ezcod_base {
@@ -221,9 +221,9 @@ namespace ezpwd {
 	char			separator;		// Separator between location and parity symbols
 	char			space;			// Fill space between location symbol chunks

-	// 
+	//
 	// ezcod<P,L>() -- supply non-defaults for location precision, chunk size, etc.
-	// 
+	//
 	explicit		ezcod(
 				    double		_lat	= 0,
 				    double		_lon	= 0,
@@ -261,7 +261,7 @@ namespace ezpwd {

 	//
 	// symbols	-- return working parity and location precision
-	// 
+	//
 	virtual ezcod_base::symbols_t
 				symbols()
 	    const
@@ -302,9 +302,9 @@ namespace ezpwd {
 	    return lhs;
 	}

-	// 
+	//
 	// encode() -- encode the lat/lon to 'precision' symbols EZCOD representation
-	// 
+	//
 	virtual std::string	encode(
 				    unsigned		_preci	= 0 )	// override precision
 	    const
@@ -400,50 +400,50 @@ namespace ezpwd {
 	    return res;
 	}

-	// 
+	//
 	// deserialize	-- Extract base-32, skip whitespace, mark invalid symbols as erasures
 	// validate	-- Remove base-32 encoding, validate and remove parity, returning confidence
 	// decode	-- Attempt to decode a lat/lon, returning the confidence percentage
-	// 
+	//
 	//     If data but no parity symbols are supplied, no error checking is performed, and the
 	// confidence returned will be 0%.  No erasures within the supplied data are allowed (as
 	// there is no capacity to correct them), and an exception will be thrown.
-	// 
+	//
 	//     If parity is supplied, then erasures are allowed.  So long as the total number of
 	// erasures is <= the supplied parity symbols, then the decode will proceed (using the
 	// parity symbols to fill in the erasures), and the returned confidence will reflect the
 	// amount of unused parity capacity.  Each erasure consumes one parity symbol to repair.
-	// 
+	//
 	//     We'll allow question-mark or any of the slash characters: "_/\?" to indicate an
 	// erasure.  Either of the "!."  symbol may be used to indicates the split between location
 	// symbols and parity symbols, and must be in a position that corresponds to the indicated
 	// number of location (this->precision) and parity 'P' symbols.  Whitespace symbols and dash
 	// are ignored: " -".
-	// 
+	//
 	//     Thus, an EZCOD like "R3U 1JU QUY!0" may only be decoded by an ezcod<P=1>.  Without
 	// the "!" or ".", it could be an ezcod<P=2> w/precision == 8 -- there's no way to know for
 	// sure.  If no explicit position-parity separator is given, then we assume the default:
 	// this->precision location symbols, then up to P parity symbols.  If additional parity
 	// symbols are supplied after the separator, then However, an ezcod...<P=3>
-	// 
+	//
 	//     If an explicit "!" or "." separator IS provided, then we will attempt to decode the
 	// position with the given number of position symbols, and up to P parity symbols.
-	// 
+	//
 	// NOTE
-	// 
+	//
 	//     Due to a perhaps unexpected feature of R-S codewords, a codeword with MORE parity
 	// can be successfully decoded by an R-S codec specifying LESS parity symbols.  It so
 	// happens that the data plus (excess) parity + (remaining) parity is STILL a valid codeword
 	// (so long as the R-S Galois parameters are identical).
-	// 
+	//
 	//     Therefore, EZCODs with more parity are accepted by EZCOD parsers configured for less
 	// parity.  Of course, they will have less error/erasure correction strength -- using the
 	// correctly configured EZCOD codec expecting more R-S parity will maximize the value of all
 	// the supplied parity.
-	// 
+	//
 	//    The full amount of parity (ie. everything after the location/parity separator) is
 	// discarded in all cases, before the EZCOD location is decoded.
-	// 
+	//
    private:

 	unsigned		deserialize(
@@ -627,20 +627,20 @@ namespace ezpwd {
 	    // Compute the resolution error (in m.) of the decoded lat/lon and compute the minimum
 	    // accuracy -- the radius of the circle around the computed latitude/longitude, inside
 	    // which the original latitude/longitude must have been.
-	    // 
+	    //
 	    //            original   latitude error bar
 	    //                 \     /
-	    //                  o  - 
+	    //                  o  -
 	    //                     |   longitude error bar
 	    //                     |   /
-	    //                  |--x--| 
+	    //                  |--x--|
 	    //                    /|
 	    //                   / |
 	    //           computed  -
-	    // 
+	    //
 	    // The maximum distance is the length of the diagonal of the error rectangle defined by
 	    // 1/2 the latitude/longitude error bars.
-	    // 
+	    //
 	    double		lon_circ= 1 * M_PI * 6371000;
 	    double		lat_circ= 2 * M_PI * 6371000 * std::cos( latitude * M_PI / 180 );
 	    latitude_error		= lat_err * lon_circ;
@@ -653,13 +653,13 @@ namespace ezpwd {
    }; // class ezcod


-    // 
+    //
    // ezcod::rscodec	-- Reed-Solomon parity codec
    // ezcod::bits	-- distribution of lat/lon precision in each code symbol
-    // 
+    //
    //     Quickly establishes an extra bit of precision for Longitude, and then evenly distributes
    // future precision between lat/lon, always maintaining extra precision for Longitude.
-    // 
+    //
    template < unsigned P, unsigned L >
    const ezpwd::RS<31,31-P>	ezcod<P,L>::rscodec;

--- a/src/ezpwd/output
+++ b/src/ezpwd/output
@@ -11,18 +11,18 @@
 #include <map>
 #include <vector>

-// 
+//
 // ezpwd::hexchr	-- escape/hexify char c, output using func/meth f, in width w >= 2
 // ezpwd::hexify	-- hexify something that can be converted to an unsigned char
 // ezpwd::hexout	-- hexify each element in the range (beg,end], limited by stream's width
-// 
+//
 // std::ostream << ezpwd::hexify( c )		// output any char escaped/hex
 // std::ostream << ezpwd::hexout( beg, end )	// output any char iterator to ostream
 // std::ostream << std::vector<unsigend char>
 // std::ostream << std::array<unsigend char, N>
 // ezpwd::hexchr( c, [](unsigned char c){...;} )// output escaped/hex char via functor
 // ezpwd::hexout( beg, end, FILE* )		// output any char iterator to FILE*
-// 
+//
 //     Output unprintable unsigned char data in hex, escape printable/whitespace data.
 //
 namespace ezpwd {
@@ -152,19 +152,19 @@ namespace std {
        return ezpwd::hexout( lhs, rhs.begin(), rhs.end() );
    }

-    // 
+    //
    //    <ostream&> << pair<T,U>
    //    <ostream&> << set<T>		-- sorted by T
    //    <ostream&> << map<T,U>		-- sorted by T (key)
    //    <ostream&> << vector<T>
-    // 
+    //
    //     Handle output of various container types.
-    // 
+    //
    //     Output pairs and sets of pairs, respecting specified widths (as appropriate).  For example
    // a set of pairs of integeters 's', if output as "... << std::setw( 13 ) << s;", would yield:
-    // 
+    //
    //	   (	1,    2) (    3,   4) ...
-    // 
+    //

    template <class T, class U>
    std::ostream	       &operator<<(
@@ -174,8 +174,8 @@ namespace std {
        std::streamsize		w	= std::max( std::streamsize( 0 ),
 						    std::streamsize( lhs.width() - 3 ));
 	lhs << std::setw( 0 )
-	    << '('	<< std::setw(	  w / 2 ) << rhs.first 
-	    << ','	<< std::setw( w - w / 2 ) << rhs.second 
+	    << '('	<< std::setw(	  w / 2 ) << rhs.first
+	    << ','	<< std::setw( w - w / 2 ) << rhs.second
 	    << ')';
 	return lhs;
    }
@@ -190,7 +190,7 @@ namespace std {
 				si	= rhs.begin()
 		; si		       != rhs.end()
 		; ++si ) {
-	    if ( si != rhs.begin()) 
+	    if ( si != rhs.begin())
 	        lhs << ' ';
 	    lhs << std::setw( w ) << *si;
 	}
@@ -215,7 +215,7 @@ std::ostream		       &operator<<(
 				ki	= key.begin()
 	      ; ki		       != key.end()
 	      ; ++ki ) {
-	if ( ki != key.begin()) 
+	if ( ki != key.begin())
 	    lhs << ' ';
 	lhs << std::setw( w ) << *rhs.find( *ki );
    }
@@ -225,7 +225,7 @@ std::ostream		       &operator<<(

 template <class T>
 std::ostream		       &operator<<(
-				    std::ostream	   &lhs, 
+				    std::ostream	   &lhs,
 				    const std::vector<T>   &rhs )
 {
    for( size_t i = 0; i < rhs.size(); ++i ) {
@@ -238,20 +238,20 @@ std::ostream		       &operator<<(
 }
 } // namespace std

-// 
+//
 // ezpwd::buf_t		-- describe a C string buffer, to allow C++ output operations
 // ezpwd::streambuf_to_buf_t -- output charcters, always NUL terminated
-// 
+//
 // <buf_t> << ... -- Copy the <string> into the C <char*,size_t> buffer, always NUL terminating
-// 
+//
 //     Copies <string> contents into buffer, and always NUL-terminates.  Returns advanced buf_t (NOT
 // including the terminating NUL, suitable for repeating ... << <string> operations.
-// 
+//
 // std::ostream( &<streambuf_to_buf_t> ) << ...
-// 
+//
 //     Use standard ostream operations to send output to a C buffer, always NUL
 // terminating, and never exceeding capacity.
-// 
+//
 namespace ezpwd {

    typedef std::pair<char *,size_t>
@@ -266,7 +266,7 @@ namespace ezpwd {
 	//
 	//  streambuf_to_buf_t -- remember buf_t details
 	// ~streambuf_to_buf_t -- no virtual destructor required; nothing to clean up
-	// 
+	//
    			streambuf_to_buffer(
 			    char	       *buf,
 			    size_t		siz )
@@ -282,10 +282,10 @@ namespace ezpwd {
 	{
 	    ;
 	}
-			      
-	// 
+
+	//
 	// overflow -- Append c, always NUL terminating
-	// 
+	//
 	virtual int	overflow(
 			    int			c )
 	{
@@ -322,12 +322,12 @@ namespace std {
    }


-    // 
+    //
    // <std::string> << ...
-    // 
+    //
    //     Useful (but inefficient) standard output formatting directly to a std::string.  Use only for
    // testing code, for efficiency reasons...
-    // 
+    //
    template < typename T >
    inline
    std::string		operator<<(
--- a/src/ezpwd/rs
+++ b/src/ezpwd/rs
@@ -1,6 +1,6 @@
 /*
 * Ezpwd Reed-Solomon -- Reed-Solomon encoder / decoder library
- * 
+ *
 * Copyright (c) 2014, Hard Consulting Corporation.
 *
 * Ezpwd Reed-Solomon is free software: you can redistribute it and/or modify it under the terms of
@@ -8,7 +8,7 @@
 * the License, or (at your option) any later version.  See the LICENSE file at the top of the
 * source tree.  Ezpwd Reed-Solomon is also available under Commercial license.  c++/ezpwd/rs_base
 * is redistributed under the terms of the LGPL, regardless of the overall licensing terms.
- * 
+ *
 * Ezpwd Reed-Solomon is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
 * the GNU General Public License for more details.
@@ -18,31 +18,31 @@

 #include "rs_base"

-// 
+//
 // ezpwd::RS<SYMBOLS,PAYLOAD>	-- Implements an RS(SYMBOLS,PAYLOAD) codec
 // ezpwd::RS_CCSDS<...>		-- CCSDS standard 8-bit R-S codec
-// 
+//
 //     Support for Reed-Solomon codecs for symbols of 2 to 16 bits is supported.  The R-S "codeword"
 // for an N-bit symbol is defined to be 2^N-1 symbols in size.  For example, for 5-bit symbols,
 // 2^5-1 == 31, so the notation for defining an Reed-Solomon codec for 5-bit symbols is always:
 // RS(31,PAYLOAD), where PAYLOAD is always some value less than 31.  The difference is the number of
 // "parity" symbols.
-// 
+//
 //     For example, to define an RS codeword of 31 symbols w/ 4 symbols of parity and up to 27
 // symbols of data, you would say: RS(31,27).  Of course, you can supply smaller amounts of data;
 // the balance is assumed to be NUL (zero) symbols.
-// 
+//
 namespace ezpwd {

-    // 
-    // __RS( ... ) -- Define a reed-solomon codec 
-    // 
+    //
+    // __RS( ... ) -- Define a reed-solomon codec
+    //
    // @SYMBOLS:	Total number of symbols; must be a power of 2 minus 1, eg 2^8-1 == 255
    // @PAYLOAD:	The maximum number of non-parity symbols, eg 253 ==> 2 parity symbols
    // @POLY:		A primitive polynomial appropriate to the SYMBOLS size
    // @FCR:		The first consecutive root of the Reed-Solomon generator polynomial
    // @PRIM:		The primitive root of the generator polynomial
-    // 
+    //
 #   define __RS_TYP( TYPE, SYMBOLS, PAYLOAD, POLY, FCR, PRIM )		\
 	ezpwd::reed_solomon<						\
 	    TYPE,							\
@@ -66,10 +66,10 @@ namespace ezpwd {
    // standard Reed-Solomon codecs using macros of a similar form, eg. RS<255, 252>. Standard PLY,
    // FCR and PRM values are provided for various SYMBOL sizes, along with appropriate basic types
    // capable of holding all internal Reed-Solomon tabular data.
-    // 
+    //
    //     In order to provide "default initialization" of const RS<...> types, a user-provided
    // default constructor must be provided.
-    // 
+    //
    template < size_t SYMBOLS, size_t PAYLOAD > struct RS;
    template < size_t PAYLOAD > struct RS<    3, PAYLOAD> : public __RS( RS, uint8_t,      3, PAYLOAD,     0x7,	 1,  1 );
    template < size_t PAYLOAD > struct RS<    7, PAYLOAD> : public __RS( RS, uint8_t,      7, PAYLOAD,     0xb,	 1,  1 );
@@ -86,29 +86,29 @@ namespace ezpwd {
    template < size_t PAYLOAD > struct RS<16383, PAYLOAD> : public __RS( RS, uint16_t, 16383, PAYLOAD,  0x4443,	 1,  1 );
    template < size_t PAYLOAD > struct RS<32767, PAYLOAD> : public __RS( RS, uint16_t, 32767, PAYLOAD,  0x8003,	 1,  1 );
    template < size_t PAYLOAD > struct RS<65535, PAYLOAD> : public __RS( RS, uint16_t, 65535, PAYLOAD, 0x1100b,	 1,  1 );
-    
+
    template < size_t SYMBOLS, size_t PAYLOAD > struct RS_CCSDS;
    template < size_t PAYLOAD > struct RS_CCSDS<255, PAYLOAD> : public __RS( RS_CCSDS, uint8_t, 255, PAYLOAD, 0x187, 112, 11 );


-    // 
+    //
    // strength<PARITY>	-- compute strength (given N parity symbols) of R-S correction
-    // 
+    //
    //     Returns a confidence strength rating, which is the ratio:
-    // 
+    //
    //         100 - ( errors * 2 + erasures ) * 100 / parity
-    // 
+    //
    // which is proportional to the number of parity symbols unused by the reported number of
    // corrected symbols.  If 0, then all parity resources were consumed to recover the R-S
    // codeword, and we can have no confidence in the result.  If -'ve, indicates more parity
    // resources were consumed than available, indicating that the result is likely incorrect.
-    // 
+    //
    //     Accounts for the fact that a signalled erasure may not be reported in the corrected
    // position vector, if the symbol happens to match the computed value.  Note that even if the
    // error or erasure occurs within the "parity" portion of the codeword, this doesn't reduce the
    // effective strength -- all symbols in the R-S complete codeword are equally effective in
    // recovering any other symbol in error/erasure.
-    // 
+    //
    template < size_t PARITY >
    int				strength(
 				    int			corrected,
@@ -162,7 +162,7 @@ namespace ezpwd {
 #endif
 	return confidence;
    }
-    
+
 } // namespace ezpwd
-    
+
 #endif // _EZPWD_RS
--- a/src/ezpwd/rs_base
+++ b/src/ezpwd/rs_base
@@ -1,6 +1,6 @@
 /*
 * Ezpwd Reed-Solomon -- Reed-Solomon encoder / decoder library
- * 
+ *
 * Copyright (c) 2014, Hard Consulting Corporation.
 *
 * Ezpwd Reed-Solomon is free software: you can redistribute it and/or modify it under the terms of
@@ -9,43 +9,43 @@
 * source tree.  Ezpwd Reed-Solomon is also available under Commercial license.  The
 * c++/ezpwd/rs_base file is redistributed under the terms of the LGPL, regardless of the overall
 * licensing terms.
- * 
+ *
 * Ezpwd Reed-Solomon is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
 * the GNU General Public License for more details.
- * 
+ *
 * The core Reed-Solomon codec implementation in c++/ezpwd/rs_base is by Phil Karn, converted to C++
 * by Perry Kundert (perry@hardconsulting.com), and may be used under the terms of the LGPL.  Here
 * is the terms from Phil's README file (see phil-karn/fec-3.0.1/README):
- * 
+ *
 *     COPYRIGHT
- * 
+ *
 *     This package is copyright 2006 by Phil Karn, KA9Q. It may be used
 *     under the terms of the GNU Lesser General Public License (LGPL). See
 *     the file "lesser.txt" in this package for license details.
- * 
+ *
 * The c++/ezpwd/rs_base file is, therefore, redistributed under the terms of the LGPL, while the
 * rest of Ezpwd Reed-Solomon is distributed under either the GPL or Commercial licenses.
 * Therefore, even if you have obtained Ezpwd Reed-Solomon under a Commercial license, you must make
 * available the source code of the c++/ezpwd/rs_base file with your product.  One simple way to
 * accomplish this is to include the following URL in your code or documentation:
- * 
+ *
 *     https://github.com/pjkundert/ezpwd-reed-solomon/blob/master/c++/ezpwd/rs_base
- * 
- * 
+ *
+ *
 * The Linux 3.15.1 version of lib/reed_solomon was also consulted as a cross-reference, which (in
 * turn) is basically verbatim copied from Phil Karn's LGPL implementation, to ensure that no new
 * defects had been found and fixed; there were no meaningful changes made to Phil's implementation.
 * I've personally been using Phil's implementation for years in a heavy industrial use, and it is
 * rock-solid.
- * 
+ *
 * However, both Phil's and the Linux kernel's (copy of Phil's) implementation will return a
 * "corrected" decoding with impossible error positions, in some cases where the error load
 * completely overwhelms the R-S encoding.  These cases, when detected, are rejected in this
 * implementation.  This could be considered a defect in Phil's (and hence the Linux kernel's)
 * implementations, which results in them accepting clearly incorrect R-S decoded values as valid
 * (corrected) R-S codewords.  We chose the report failure on these attempts.
- * 
+ *
 */
 #ifndef _EZPWD_RS_BASE
 #define _EZPWD_RS_BASE
@@ -58,14 +58,14 @@
 #include <type_traits>
 #include <vector>

-// 
+//
 // Preprocessor defines available:
-// 
+//
 // EZPWD_NO_EXCEPTS -- define to use no exceptions; return -1, or abort on catastrophic failures
 // EZPWD_NO_MOD_TAB -- define to force no "modnn" Galois modulo table acceleration
 // EZPWD_ARRAY_SAFE -- define to force usage of bounds-checked arrays for most tabular data
 // EZPWD_ARRAY_TEST -- define to force erroneous sizing of some arrays for non-production testing
-// 
+//

 #if defined( DEBUG ) && DEBUG >= 2
 #  include "output"	// ezpwd::hex... std::ostream shims for outputting containers of uint8_t data
@@ -117,35 +117,35 @@ namespace ezpwd {
 	    return lhs << "RS(" << this->size() << "," << this->load() << ")";
 	}

-	// 
+	//
 	// {en,de}code -- Compute/Correct errors/erasures in a Reed-Solomon encoded container
-	// 
+	//
 	///     The encoded parity symbols may be included in 'data' (len includes nroots() parity
 	/// symbols), or may (optionally) supplied separately in (at least nroots()-sized)
-	/// 'parity'.  
-	/// 
+	/// 'parity'.
+	///
 	///     For decode, optionally specify some known erasure positions (up to nroots()).  If
 	/// non-empty 'erasures' is provided, it contains the positions of each erasure.  If a
 	/// non-zero pointer to a 'position' vector is provided, its capacity will be increased to
 	/// be capable of storing up to 'nroots()' ints; the actual deduced error locations will be
 	/// returned.
-	///  
+	///
 	/// RETURN VALUE
-	/// 
+	///
 	///     Return -1 on error.  The encode returns the number of parity symbols produced;
 	/// decode returns the number of symbols corrected.  Both errors and erasures are included,
 	/// so long as they are actually different than the deduced value.  In other words, if a
 	/// symbol is marked as an erasure but it actually turns out to be correct, it's index will
 	/// NOT be included in the returned count, nor the modified erasure vector!
-	/// 
+	///

-	// 
+	//
 	// encode(<string>) -- extend string to contain parity, or place in supplied parity string
 	// encode(<vector>) -- extend vector to contain parity, or place in supplied parity vector
 	// encode(<array>)  -- ignore 'pad' elements of array, puts nroots() parity symbols at end
 	// encode(pair<iter,iter>) -- encode all except the last nroots() of the data, put parity at end
 	// encode(pair<iter,iter>, pair<iter,iter>) -- encode data between first <iter> pair, put parity in second pair
-	// 
+	//
 	int			encode(
 				    std::string	       &data )
 	    const
@@ -388,11 +388,11 @@ namespace ezpwd {
 	= 0;
    }; // class reed_solomon_base

-    // 
+    //
    // std::ostream << ezpwd::reed_solomon<...>
-    // 
+    //
    //     Output a R-S codec description in standard form eg. RS(255,253)
-    // 
+    //
    inline
    std::ostream	       &operator<<(
 				    std::ostream       &lhs,
@@ -421,10 +421,10 @@ namespace ezpwd {
 	    return sr;
 	}
    };
-    
-    // 
+
+    //
    // class reed_solomon_tabs -- R-S tables common to all RS(NN,*) with same SYM, PRM and PLY
-    // 
+    //
    template < typename TYP, int SYM, int PRM, class PLY >
    class reed_solomon_tabs
 	: public reed_solomon_base {
@@ -501,7 +501,7 @@ namespace ezpwd {
 	    iprim			= iptmp / PRM;
 	}

-	// 
+	//
 	// modnn -- modulo replacement for galois field arithmetics, optionally w/ table acceleration
 	//
 	//  @x:		the value to reduce (will never be -'ve)
@@ -555,7 +555,7 @@ namespace ezpwd {
    //     All reed_solomon<T, ...> instances with the same template type parameters share a common
    // (static) set of alpha_to, index_of and genpoly tables.  The first instance to be constructed
    // initializes the tables.
-    // 
+    //
    //     Each specialized type of reed_solomon implements a specific encode/decode method
    // appropriate to its datum 'TYP'.  When accessed via a generic reed_solomon_base pointer, only
    // access via "safe" (size specifying) containers or iterators is available.
@@ -722,7 +722,7 @@ namespace ezpwd {
 	    }
 	    return NROOTS;
 	}
-	    
+
 	using reed_solomon_base::decode;
 	virtual int		decode(
 				    const std::pair<uint8_t *, uint8_t *>
@@ -811,14 +811,14 @@ namespace ezpwd {
 				erasure, position );
 	}

-	// 
+	//
 	// decode_mask	-- mask INP data into valid SYMBOL data
-	// 
+	//
 	///     Incoming data may be in a variety of sizes, and may contain information beyond the
 	/// R-S symbol capacity.  For example, we might use a 6-bit R-S symbol to correct the lower
 	/// 6 bits of an 8-bit data character.  This would allow us to correct common substitution
 	/// errors (such as '2' for '3', 'R' for 'T', 'n' for 'm').
-	/// 
+	///
 	template < typename INP >
 	int			decode_mask(
 				    INP		       *data,
@@ -1078,7 +1078,7 @@ namespace ezpwd {
 #if DEBUG >= 1
 	    // Test code that verifies the erasure locator polynomial just constructed
 	    // Needed only for decoder debugging.
-    
+
 	    // find roots of the erasure location polynomial
 	    for( int i = 1; i<= no_eras; i++ )
 		reg[i]			= index_of[lambda[i]];
@@ -1100,7 +1100,7 @@ namespace ezpwd {
 		count++;
 	    }
 	    if ( count != no_eras ) {
-		std::cout << "ERROR: count = " << count << ", no_eras = " << no_eras 
+		std::cout << "ERROR: count = " << count << ", no_eras = " << no_eras
 			  << "lambda(x) is WRONG"
 			  << std::endl;
 		count			= -1;
@@ -1309,12 +1309,12 @@ namespace ezpwd {
 	}
    }; // class reed_solomon

-    // 
+    //
    // Define the static reed_solomon...<...> members; allowed in header for template types.
-    // 
+    //
    //     The reed_solomon_tags<...>::iprim < 0 is used to indicate to the first instance that the
    // static tables require initialization.
-    // 
+    //
    template < typename TYP, int SYM, int PRM, class PLY >
        int				reed_solomon_tabs< TYP, SYM, PRM, PLY >::iprim = -1;

@@ -1340,5 +1340,5 @@ namespace ezpwd {
 					reed_solomon< TYP, SYM, RTS, FCR, PRM, PLY >::genpoly;

 } // namespace ezpwd
-    
+
 #endif // _EZPWD_RS_BASE
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`These .bat files are ONLY for use on the portable cygwin builds, do not use these in any other build environments!`