diff --git a/bacnet-stack/demo/BACnetDemo.workspace b/bacnet-stack/demo/BACnetDemo.workspace
index 1e429525..d3654414 100644
--- a/bacnet-stack/demo/BACnetDemo.workspace
+++ b/bacnet-stack/demo/BACnetDemo.workspace
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="Workspace">
-		<Project filename="..\lib\bacnet.cbp" />
+		<Project filename="..\lib\bacnet.cbp" active="1" />
 		<Project filename="server\bacserv.cbp" />
 		<Project filename="epics\bacepics.cbp" />
 		<Project filename="readprop\bacrp.cbp" />
-		<Project filename="whois\bacwi.cbp" active="1" />
+		<Project filename="whois\bacwi.cbp" />
+		<Project filename="..\ports\win32\bacnet.cbp" />
+		<Project filename="..\ports\win32\rs485.cbp" />
 	</Workspace>
 </CodeBlocks_workspace_file>
diff --git a/bacnet-stack/demo/dcc/main.c b/bacnet-stack/demo/dcc/main.c
index 6f4e6890..cae07898 100644
--- a/bacnet-stack/demo/dcc/main.c
+++ b/bacnet-stack/demo/dcc/main.c
@@ -217,7 +217,7 @@ static void Init_DataLink(
         if (bbmd_address) {
             struct in_addr addr;
             addr.s_addr = bbmd_address;
-            printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
+            printf("DeviceCommunicationControl: Registering with BBMD at %s:%ld for %ld seconds\n",
                 inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
             bvlc_register_with_bbmd(bbmd_address, bbmd_port,
                 bbmd_timetolive_seconds);
diff --git a/bacnet-stack/demo/epics/main.c b/bacnet-stack/demo/epics/main.c
index c1a1b903..9729c8c8 100644
--- a/bacnet-stack/demo/epics/main.c
+++ b/bacnet-stack/demo/epics/main.c
@@ -386,7 +386,7 @@ static void Init_DataLink(
         if (bbmd_address) {
             struct in_addr addr;
             addr.s_addr = bbmd_address;
-            printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
+            printf("EPICS: Registering with BBMD at %s:%ld for %ld seconds\n",
                 inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
             bvlc_register_with_bbmd(bbmd_address, bbmd_port,
                 bbmd_timetolive_seconds);
diff --git a/bacnet-stack/demo/readfile/main.c b/bacnet-stack/demo/readfile/main.c
index dd5d1fd9..fa9b5970 100644
--- a/bacnet-stack/demo/readfile/main.c
+++ b/bacnet-stack/demo/readfile/main.c
@@ -272,7 +272,7 @@ static void Init_DataLink(
         if (bbmd_address) {
             struct in_addr addr;
             addr.s_addr = bbmd_address;
-            printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
+            printf("AtomicReadFile: Registering with BBMD at %s:%ld for %ld seconds\n",
                 inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
             bvlc_register_with_bbmd(bbmd_address, bbmd_port,
                 bbmd_timetolive_seconds);
diff --git a/bacnet-stack/demo/reinit/main.c b/bacnet-stack/demo/reinit/main.c
index c574406d..36821d01 100644
--- a/bacnet-stack/demo/reinit/main.c
+++ b/bacnet-stack/demo/reinit/main.c
@@ -212,7 +212,7 @@ static void Init_DataLink(
         if (bbmd_address) {
             struct in_addr addr;
             addr.s_addr = bbmd_address;
-            printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
+            printf("ReinitDevice: Registering with BBMD at %s:%ld for %ld seconds\n",
                 inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
             bvlc_register_with_bbmd(bbmd_address, bbmd_port,
                 bbmd_timetolive_seconds);
diff --git a/bacnet-stack/demo/server/main.c b/bacnet-stack/demo/server/main.c
index 8b1aa8b1..395bc377 100644
--- a/bacnet-stack/demo/server/main.c
+++ b/bacnet-stack/demo/server/main.c
@@ -175,7 +175,7 @@ static void Init_DataLink(
         if (bbmd_address) {
             struct in_addr addr;
             addr.s_addr = bbmd_address;
-            printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
+            printf("Server: Registering with BBMD at %s:%ld for %ld seconds\n",
                 inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
             bvlc_register_with_bbmd(bbmd_address, bbmd_port,
                 bbmd_timetolive_seconds);
diff --git a/bacnet-stack/demo/timesync/main.c b/bacnet-stack/demo/timesync/main.c
index 51838a20..7a0a8caa 100644
--- a/bacnet-stack/demo/timesync/main.c
+++ b/bacnet-stack/demo/timesync/main.c
@@ -181,7 +181,7 @@ static void Init_DataLink(
         if (bbmd_address) {
             struct in_addr addr;
             addr.s_addr = bbmd_address;
-            printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
+            printf("TimeSync: Registering with BBMD at %s:%ld for %ld seconds\n",
                 inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
             bvlc_register_with_bbmd(bbmd_address, bbmd_port,
                 bbmd_timetolive_seconds);
diff --git a/bacnet-stack/demo/ucov/main.c b/bacnet-stack/demo/ucov/main.c
index f2ec7562..0ca72995 100644
--- a/bacnet-stack/demo/ucov/main.c
+++ b/bacnet-stack/demo/ucov/main.c
@@ -142,7 +142,7 @@ static void Init_DataLink(
         if (bbmd_address) {
             struct in_addr addr;
             addr.s_addr = bbmd_address;
-            printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
+            printf("UnconfirmedCOV: Registering with BBMD at %s:%ld for %ld seconds\n",
                 inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
             bvlc_register_with_bbmd(bbmd_address, bbmd_port,
                 bbmd_timetolive_seconds);
diff --git a/bacnet-stack/demo/whohas/main.c b/bacnet-stack/demo/whohas/main.c
index 678dbd94..c666e669 100644
--- a/bacnet-stack/demo/whohas/main.c
+++ b/bacnet-stack/demo/whohas/main.c
@@ -181,7 +181,7 @@ static void Init_DataLink(
         if (bbmd_address) {
             struct in_addr addr;
             addr.s_addr = bbmd_address;
-            printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
+            printf("WhoHas: Registering with BBMD at %s:%ld for %ld seconds\n",
                 inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
             bvlc_register_with_bbmd(bbmd_address, bbmd_port,
                 bbmd_timetolive_seconds);
diff --git a/bacnet-stack/demo/writefile/main.c b/bacnet-stack/demo/writefile/main.c
index f8f97ca3..a2703602 100644
--- a/bacnet-stack/demo/writefile/main.c
+++ b/bacnet-stack/demo/writefile/main.c
@@ -226,7 +226,7 @@ static void Init_DataLink(
         if (bbmd_address) {
             struct in_addr addr;
             addr.s_addr = bbmd_address;
-            printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
+            printf("AtomicWriteFile: Registering with BBMD at %s:%ld for %ld seconds\n",
                 inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
             bvlc_register_with_bbmd(bbmd_address, bbmd_port,
                 bbmd_timetolive_seconds);
diff --git a/bacnet-stack/demo/writeprop/main.c b/bacnet-stack/demo/writeprop/main.c
index c24579c5..c5cc2626 100644
--- a/bacnet-stack/demo/writeprop/main.c
+++ b/bacnet-stack/demo/writeprop/main.c
@@ -223,7 +223,7 @@ static void Init_DataLink(
         if (bbmd_address) {
             struct in_addr addr;
             addr.s_addr = bbmd_address;
-            printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
+            printf("WriteProperty: Registering with BBMD at %s:%ld for %ld seconds\n",
                 inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
             bvlc_register_with_bbmd(bbmd_address, bbmd_port,
                 bbmd_timetolive_seconds);
diff --git a/bacnet-stack/lib/Makefile b/bacnet-stack/lib/Makefile
index d599a264..e0510edd 100644
--- a/bacnet-stack/lib/Makefile
+++ b/bacnet-stack/lib/Makefile
@@ -42,6 +42,7 @@ CORE_SRC = \
 	$(BACNET_CORE)/bactext.c \
 	$(BACNET_CORE)/datetime.c \
 	$(BACNET_CORE)/indtext.c \
+	$(BACNET_CORE)/debug.c \
 	$(BACNET_CORE)/bigend.c \
 	$(BACNET_CORE)/arf.c \
 	$(BACNET_CORE)/awf.c \
diff --git a/bacnet-stack/lib/bacnet.cbp b/bacnet-stack/lib/bacnet.cbp
index 5f45098a..dfebd80b 100644
--- a/bacnet-stack/lib/bacnet.cbp
+++ b/bacnet-stack/lib/bacnet.cbp
@@ -297,6 +297,9 @@
 		<Unit filename="..\src\dcc.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\src\debug.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\filename.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/bacnet-stack/lib/makefile.b32 b/bacnet-stack/lib/makefile.b32
index ed095c37..df33a67c 100644
--- a/bacnet-stack/lib/makefile.b32
+++ b/bacnet-stack/lib/makefile.b32
@@ -46,6 +46,7 @@ CORE1_SRC = $(BACNET_CORE)\apdu.c \
 	$(BACNET_CORE)\bactext.c \
 	$(BACNET_CORE)\datetime.c \
 	$(BACNET_CORE)\indtext.c \
+	$(BACNET_CORE)\debug.c \
 	$(BACNET_CORE)\bigend.c \
 	$(BACNET_CORE)\abort.c \
 	$(BACNET_CORE)\reject.c \
diff --git a/bacnet-stack/ports/win32/bacnet.cbp b/bacnet-stack/ports/win32/bacnet.cbp
index 2b20ae2f..17e44588 100644
--- a/bacnet-stack/ports/win32/bacnet.cbp
+++ b/bacnet-stack/ports/win32/bacnet.cbp
@@ -43,6 +43,7 @@
 		<Linker>
 			<Add library="..\..\lib\libbacnet.a" />
 			<Add library="ws2_32" />
+			<Add library="iphlpapi" />
 		</Linker>
 		<Unit filename="..\..\include\bacaddr.h" />
 		<Unit filename="..\..\include\bacdef.h" />
diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.dsp b/bacnet-stack/ports/win32/bacnet/bacnet.dsp
index bf3b0733..c7e88cda 100644
--- a/bacnet-stack/ports/win32/bacnet/bacnet.dsp
+++ b/bacnet-stack/ports/win32/bacnet/bacnet.dsp
@@ -157,10 +157,6 @@ SOURCE=..\..\..\demo\object\bi.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\bigend.c
-# End Source File
-# Begin Source File
-
 SOURCE="..\bip-init.c"
 # End Source File
 # Begin Source File
@@ -193,6 +189,10 @@ SOURCE=..\..\..\src\datetime.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\src\debug.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\src\dcc.c
 # End Source File
 # Begin Source File
@@ -433,6 +433,10 @@ SOURCE=..\..\..\include\datetime.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\include\debug.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\demo\object\device.h
 # End Source File
 # Begin Source File
diff --git a/bacnet-stack/ports/win32/makefile.mgw b/bacnet-stack/ports/win32/makefile.mgw
index 6aefddae..2cf482f6 100644
--- a/bacnet-stack/ports/win32/makefile.mgw
+++ b/bacnet-stack/ports/win32/makefile.mgw
@@ -53,6 +53,7 @@ CORESRC = ../../npdu.c \
 	../../reject.c \
 	../../bacapp.c \
 	../../datetime.c \
+	../../debug.c \
 	../../rp.c \
 	../../wp.c \
 	../../dcc.c \
diff --git a/bacnet-stack/ports/win32/rs485.cbp b/bacnet-stack/ports/win32/rs485.cbp
index 4fa49403..eb73566d 100644
--- a/bacnet-stack/ports/win32/rs485.cbp
+++ b/bacnet-stack/ports/win32/rs485.cbp
@@ -3,11 +3,12 @@
 	<FileVersion major="1" minor="6" />
 	<Project>
 		<Option title="rs485" />
+		<Option makefile="makefile" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin\Debug\rs485.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="bin\Debug\rs485" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj\Debug\" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -16,7 +17,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="bin\Release\rs485.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="bin\Release\rs485" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj\Release\" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -38,15 +39,17 @@
 			<Add directory="..\..\..\bacnet-stack" />
 			<Add directory="..\..\demo\handler" />
 			<Add directory="..\..\demo\object" />
+			<Add directory="..\..\include" />
 		</Compiler>
-		<Unit filename="dlmstp.h" />
-		<Unit filename="mstp.h" />
+		<Unit filename="..\..\include\dlmstp.h" />
+		<Unit filename="..\..\include\mstp.h" />
 		<Unit filename="rs485.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="rs485.h" />
 		<Extensions>
 			<code_completion />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>