diff --git a/bacnet-stack/bacstr.c b/bacnet-stack/bacstr.c
index 6ed2254b..a9b5f84d 100644
--- a/bacnet-stack/bacstr.c
+++ b/bacnet-stack/bacstr.c
@@ -191,7 +191,7 @@ bool characterstring_truncate(
   return status;
 }
 
-/* returns the length.  Returns the value in parameter. */
+/* Returns the value. */
 char *characterstring_value(BACNET_CHARACTER_STRING *char_string)
 {
   char *value = NULL;
diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.ncb b/bacnet-stack/ports/win32/bacnet/bacnet.ncb
index 3487fd33..93b6e50a 100644
Binary files a/bacnet-stack/ports/win32/bacnet/bacnet.ncb and b/bacnet-stack/ports/win32/bacnet/bacnet.ncb differ
diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.opt b/bacnet-stack/ports/win32/bacnet/bacnet.opt
index 37413f28..bfd244d5 100644
Binary files a/bacnet-stack/ports/win32/bacnet/bacnet.opt and b/bacnet-stack/ports/win32/bacnet/bacnet.opt differ
diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.plg b/bacnet-stack/ports/win32/bacnet/bacnet.plg
index 3b9cca2e..c9bf9747 100644
--- a/bacnet-stack/ports/win32/bacnet/bacnet.plg
+++ b/bacnet-stack/ports/win32/bacnet/bacnet.plg
@@ -6,7 +6,7 @@
 --------------------Configuration: bacnet - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1585.tmp" with contents
+Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP15AF.tmp" with contents
 [
 /nologo /MLd /W3 /Gm /GX /ZI /Od /I "c:\code\bacnet-stack\\" /I "c:\code\bacnet-stack\ports\win32\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "BACDL_BIP" /FR"Debug/" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
 "C:\code\bacnet-stack\abort.c"
@@ -15,9 +15,11 @@ Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1585.tmp" with conte
 "C:\code\bacnet-stack\ao.c"
 "C:\code\bacnet-stack\apdu.c"
 "C:\code\bacnet-stack\arf.c"
+"C:\code\bacnet-stack\bacapp.c"
 "C:\code\bacnet-stack\bacdcode.c"
 "C:\code\bacnet-stack\bacerror.c"
 "C:\code\bacnet-stack\bacfile.c"
+"C:\code\bacnet-stack\bacstr.c"
 "C:\code\bacnet-stack\bactext.c"
 "C:\code\bacnet-stack\bigend.c"
 "C:\code\bacnet-stack\ports\win32\bip-init.c"
@@ -36,11 +38,9 @@ Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1585.tmp" with conte
 "C:\code\bacnet-stack\tsm.c"
 "C:\code\bacnet-stack\whois.c"
 "C:\code\bacnet-stack\wp.c"
-"C:\code\bacnet-stack\bacstr.c"
-"C:\code\bacnet-stack\bacapp.c"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1585.tmp" 
-Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1586.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP15AF.tmp" 
+Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP15B0.tmp" with contents
 [
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/bacnet.pdb" /debug /machine:I386 /out:"Debug/bacnet.exe" /pdbtype:sept 
 ".\Debug\abort.obj"
@@ -49,9 +49,11 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32
 ".\Debug\ao.obj"
 ".\Debug\apdu.obj"
 ".\Debug\arf.obj"
+".\Debug\bacapp.obj"
 ".\Debug\bacdcode.obj"
 ".\Debug\bacerror.obj"
 ".\Debug\bacfile.obj"
+".\Debug\bacstr.obj"
 ".\Debug\bactext.obj"
 ".\Debug\bigend.obj"
 ".\Debug\bip-init.obj"
@@ -70,10 +72,8 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32
 ".\Debug\tsm.obj"
 ".\Debug\whois.obj"
 ".\Debug\wp.obj"
-".\Debug\bacstr.obj"
-".\Debug\bacapp.obj"
 ]
-Creating command line "link.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1586.tmp"
+Creating command line "link.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP15B0.tmp"
 <h3>Output Window</h3>
 Compiling...
 abort.c
@@ -84,9 +84,11 @@ ao.c
 c:\code\bacnet-stack\ao.c(157) : warning C4305: 'initializing' : truncation from 'const double ' to 'float '
 apdu.c
 arf.c
+bacapp.c
 bacdcode.c
 bacerror.c
 bacfile.c
+bacstr.c
 bactext.c
 bigend.c
 bip-init.c
@@ -96,10 +98,6 @@ datalink.c
 device.c
 handlers.c
 iam.c
-indtext.c
-main.c
-c:\code\bacnet-stack\ports\win32\net.h(30) : warning C4005: 'STRICT' : macro redefinition
-        c:\program files\microsoft visual studio\vc98\include\windef.h(15) : see previous definition of 'STRICT'
 Generating Code...
 c:\code\bacnet-stack\handlers.c(194) : warning C4761: integral size mismatch in argument; conversion supplied
 c:\code\bacnet-stack\handlers.c(271) : warning C4761: integral size mismatch in argument; conversion supplied
@@ -108,6 +106,10 @@ c:\code\bacnet-stack\device.c(614) : warning C4761: integral size mismatch in ar
 c:\code\bacnet-stack\device.c(627) : warning C4761: integral size mismatch in argument; conversion supplied
 c:\code\bacnet-stack\bacfile.c(285) : warning C4761: integral size mismatch in argument; conversion supplied
 Compiling...
+indtext.c
+main.c
+c:\code\bacnet-stack\ports\win32\net.h(30) : warning C4005: 'STRICT' : macro redefinition
+        c:\program files\microsoft visual studio\vc98\include\windef.h(15) : see previous definition of 'STRICT'
 npdu.c
 reject.c
 ringbuf.c
@@ -115,13 +117,11 @@ rp.c
 tsm.c
 whois.c
 wp.c
-bacstr.c
-bacapp.c
 Generating Code...
 c:\code\bacnet-stack\wp.c(129) : warning C4761: integral size mismatch in argument; conversion supplied
 c:\code\bacnet-stack\npdu.c(332) : warning C4761: integral size mismatch in argument; conversion supplied
 Linking...
-Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1588.tmp" with contents
+Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP15B2.tmp" with contents
 [
 /nologo /o"Debug/bacnet.bsc" 
 ".\Debug\abort.sbr"
@@ -130,9 +130,11 @@ Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1588.tmp" with conte
 ".\Debug\ao.sbr"
 ".\Debug\apdu.sbr"
 ".\Debug\arf.sbr"
+".\Debug\bacapp.sbr"
 ".\Debug\bacdcode.sbr"
 ".\Debug\bacerror.sbr"
 ".\Debug\bacfile.sbr"
+".\Debug\bacstr.sbr"
 ".\Debug\bactext.sbr"
 ".\Debug\bigend.sbr"
 ".\Debug\bip-init.sbr"
@@ -150,10 +152,8 @@ Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1588.tmp" with conte
 ".\Debug\rp.sbr"
 ".\Debug\tsm.sbr"
 ".\Debug\whois.sbr"
-".\Debug\wp.sbr"
-".\Debug\bacstr.sbr"
-".\Debug\bacapp.sbr"]
-Creating command line "bscmake.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP1588.tmp"
+".\Debug\wp.sbr"]
+Creating command line "bscmake.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP15B2.tmp"
 Creating browse info file...
 <h3>Output Window</h3>