diff --git a/bacnet-stack/ports/atmega168/bacnet.aps b/bacnet-stack/ports/atmega168/bacnet.aps
index 4486921e..b55ef2a5 100644
--- a/bacnet-stack/ports/atmega168/bacnet.aps
+++ b/bacnet-stack/ports/atmega168/bacnet.aps
@@ -1 +1 @@
-<AVRStudio><MANAGEMENT><Created>13-Aug-2007 15:08:27</Created><LastEdit>14-Aug-2007 17:09:10</LastEdit><ProjectType>0</ProjectType><Created>13-Aug-2007 15:08:27</Created><Version>4</Version><Build>4, 13, 0, 528</Build><ProjectTypeName>AVR GCC</ProjectTypeName><ICON>241</ICON><ProjectName>bacnet</ProjectName><Created>13-Aug-2007 15:11:07</Created><LastEdit>13-Aug-2007 15:11:07</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>13-Aug-2007 15:11:07</Created><Version>4</Version><Build>4, 13, 0, 528</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>default\bacnet.elf</ObjectFile><EntryFile></EntryFile><ObjectFile></ObjectFile><EntryFile></EntryFile><SaveFolder>C:\code\bacnet-stack\ports\atmega168\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_PART></CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><CURRENT_TARGET>AVR Simulator</CURRENT_TARGET><CURRENT_TARGET>AVR Simulator</CURRENT_TARGET><CURRENT_PART>ATmega168.xml</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND></IO_EXPAND><REGISTERNAMES></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>0</WATCHNUM><WATCHNAMES><Pane0></Pane0><Pane1></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module></module></modules><Triggers><trigger clsid="{113824F1-C410-4699-A25E-867CC860C28E}" enabled="1" boundTo="0" hitCount="1" updateAndContinue="0" line="66" file="main.c" token="	    Timer_Milliseconds--;" offset="0"/><trigger clsid="{113824F1-C410-4699-A25E-867CC860C28E}" enabled="1" boundTo="0" hitCount="1" updateAndContinue="0" line="76" file="main.c" token="	    task_milliseconds();" offset="0"/></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>main.c</SOURCEFILE><SOURCEFILE>rs485.c</SOURCEFILE><SOURCEFILE>timer.c</SOURCEFILE><HEADERFILE>avr035.h</HEADERFILE><HEADERFILE>hardware.h</HEADERFILE><HEADERFILE>rs485.h</HEADERFILE><HEADERFILE>iocompat.h</HEADERFILE><HEADERFILE>timer.h</HEADERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>NO</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE></EXTERNALMAKEFILE><PART>atmega168</PART><HEX>1</HEX><LIST>0</LIST><MAP>0</MAP><OUTPUTFILENAME>bacnet.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>0</ISDIRTY><OPTIONS><OPTION><FILE>main.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>rs485.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>timer.c</FILE><OPTIONLIST></OPTIONLIST></OPTION></OPTIONS><INCDIRS><INCLUDE>..\..\</INCLUDE></INCDIRS><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2 -DF_CPU=7372800UL -O0 -fsigned-char</OPTIONSFORALL><LINKEROPTIONS></LINKEROPTIONS><SEGMENTS/></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\WinAVR-20070525\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\WinAVR-20070525\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><MANAGEMENT></MANAGEMENT><CODE_CREATION></CODE_CREATION><DEBUG_TARGET></DEBUG_TARGET><Debugger></Debugger><IOView><usergroups/></IOView><Files><File00000><FileId>00000</FileId><FileName>C:\WinAVR-20070525\avr\include\avr\eeprom.h</FileName><Status>1</Status></File00000><File00001><FileId>00001</FileId><FileName>C:\WinAVR-20070525\avr\include\avr\iomx8.h</FileName><Status>1</Status></File00001><File00002><FileId>00002</FileId><FileName>C:\WinAVR-20070525\examples\stdiodemo\uart.h</FileName><Status>1</Status></File00002><File00003><FileId>00003</FileId><FileName>C:\WinAVR-20070525\examples\stdiodemo\uart.c</FileName><Status>1</Status></File00003><File00004><FileId>00004</FileId><FileName>main.c</FileName><Status>1</Status></File00004><File00005><FileId>00005</FileId><FileName>timer.c</FileName><Status>259</Status></File00005></Files><Workspace><File00000><Position>748 696 908 720</Position><LineCol>20 45</LineCol></File00000><File00001><Position>566 211 1235 650</Position><LineCol>690 21</LineCol></File00001><File00002><Position>428 696 588 720</Position><LineCol>0 0</LineCol></File00002><File00003><Position>268 696 428 720</Position><LineCol>0 0</LineCol></File00003><File00004><Position>444 272 1300 698</Position><LineCol>50 14</LineCol></File00004><File00005><Position>290 118 1092 520</Position><LineCol>52 2</LineCol></File00005></Workspace><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>
+<AVRStudio><MANAGEMENT><Created>13-Aug-2007 15:08:27</Created><LastEdit>15-Aug-2007 11:27:19</LastEdit><ProjectType>0</ProjectType><Created>13-Aug-2007 15:08:27</Created><Version>4</Version><Build>4, 13, 0, 528</Build><ProjectTypeName>AVR GCC</ProjectTypeName><ICON>241</ICON><ProjectName>bacnet</ProjectName><Created>13-Aug-2007 15:11:07</Created><LastEdit>13-Aug-2007 15:11:07</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>13-Aug-2007 15:11:07</Created><Version>4</Version><Build>4, 13, 0, 528</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>default\bacnet.elf</ObjectFile><EntryFile></EntryFile><ObjectFile></ObjectFile><EntryFile></EntryFile><SaveFolder>C:\code\bacnet-stack\ports\atmega168\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_PART>ATmega168</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><CURRENT_TARGET>AVR Simulator</CURRENT_TARGET><CURRENT_TARGET>AVR Simulator</CURRENT_TARGET><CURRENT_PART>ATmega168.xml</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND></IO_EXPAND><REGISTERNAMES></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>0</WATCHNUM><WATCHNAMES><Pane0></Pane0><Pane1></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module></module></modules><Triggers><trigger clsid="{113824F1-C410-4699-A25E-867CC860C28E}" enabled="1" boundTo="0" hitCount="1" updateAndContinue="0" line="68" file="main.c" token="	    Timer_Milliseconds--;" offset="0"/></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>main.c</SOURCEFILE><SOURCEFILE>rs485.c</SOURCEFILE><SOURCEFILE>timer.c</SOURCEFILE><HEADERFILE>avr035.h</HEADERFILE><HEADERFILE>hardware.h</HEADERFILE><HEADERFILE>rs485.h</HEADERFILE><HEADERFILE>timer.h</HEADERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>NO</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE></EXTERNALMAKEFILE><PART>atmega168</PART><HEX>1</HEX><LIST>0</LIST><MAP>0</MAP><OUTPUTFILENAME>bacnet.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>1</ISDIRTY><OPTIONS><OPTION><FILE>main.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>rs485.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>timer.c</FILE><OPTIONLIST></OPTIONLIST></OPTION></OPTIONS><INCDIRS><INCLUDE>..\..\</INCLUDE></INCDIRS><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2 -DF_CPU=7372800UL -O0 -fsigned-char</OPTIONSFORALL><LINKEROPTIONS></LINKEROPTIONS><SEGMENTS/></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\WinAVR-20070525\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\WinAVR-20070525\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><MANAGEMENT></MANAGEMENT><CODE_CREATION></CODE_CREATION><DEBUG_TARGET></DEBUG_TARGET><Debugger></Debugger><AVRSimulator><FuseExt>0</FuseExt><FuseHigh>28</FuseHigh><FuseLow>216</FuseLow><LockBits>193</LockBits><Frequency>7372800</Frequency><ExtSRAM>0</ExtSRAM><SimBoot>1</SimBoot><SimBootnew>1</SimBootnew></AVRSimulator><IOView><usergroups/></IOView><Files><File00000><FileId>00000</FileId><FileName>C:\WinAVR-20070525\avr\include\avr\eeprom.h</FileName><Status>1</Status></File00000><File00001><FileId>00001</FileId><FileName>C:\WinAVR-20070525\avr\include\avr\iomx8.h</FileName><Status>1</Status></File00001><File00002><FileId>00002</FileId><FileName>C:\WinAVR-20070525\examples\stdiodemo\uart.h</FileName><Status>1</Status></File00002><File00003><FileId>00003</FileId><FileName>C:\WinAVR-20070525\examples\stdiodemo\uart.c</FileName><Status>1</Status></File00003><File00004><FileId>00004</FileId><FileName>main.c</FileName><Status>259</Status></File00004><File00005><FileId>00005</FileId><FileName>timer.c</FileName><Status>259</Status></File00005><File00006><FileId>00006</FileId><FileName>rs485.c</FileName><Status>257</Status></File00006><File00007><FileId>00007</FileId><FileName>hardware.h</FileName><Status>1</Status></File00007><File00008><FileId>00008</FileId><FileName>C:\WinAVR-20070525\avr\include\avr\interrupt.h</FileName><Status>1</Status></File00008></Files><Workspace><File00000><Position>429 695 589 719</Position><LineCol>0 0</LineCol></File00000><File00001><Position>269 97 1069 497</Position><LineCol>670 23</LineCol></File00001><File00002><Position>589 695 749 719</Position><LineCol>0 0</LineCol></File00002><File00003><Position>269 695 429 719</Position><LineCol>0 0</LineCol></File00003><File00004><Position>313 141 1113 541</Position><LineCol>85 13</LineCol></File00004><File00005><Position>335 163 1135 563</Position><LineCol>38 26</LineCol></File00005><File00006><Position>291 119 1091 519</Position><LineCol>0 0</LineCol></File00006><File00007><Position>357 185 1157 585</Position><LineCol>32 27</LineCol></File00007><File00008><Position>445 273 1245 697</Position><LineCol>101 0</LineCol></File00008></Workspace><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>
diff --git a/bacnet-stack/ports/atmega168/main.c b/bacnet-stack/ports/atmega168/main.c
index 29f8c54b..4046c905 100644
--- a/bacnet-stack/ports/atmega168/main.c
+++ b/bacnet-stack/ports/atmega168/main.c
@@ -50,7 +50,9 @@ void init(void)
     DDRD = 0;
     PORTD = 0;
 
-	/* Configure the watchdog timer */
+	/* Configure the watchdog timer - Disabled for testing */
+    BIT_CLEAR(MCUSR,WDRF);
+    WDTCSR = 0;
 
 	/* Configure USART */
     RS485_Set_Baud_Rate(38400);
diff --git a/bacnet-stack/ports/atmega168/rs485.c b/bacnet-stack/ports/atmega168/rs485.c
index 4721717b..58d47b84 100644
--- a/bacnet-stack/ports/atmega168/rs485.c
+++ b/bacnet-stack/ports/atmega168/rs485.c
@@ -51,8 +51,16 @@ void RS485_Initialize(void)
     /* enable Transmit and Receive */
     UCSR0B = _BV(TXEN0) | _BV(RXEN0); 
 
-    /* Set frame format: 8data, 2stop bit */
-    UCSR0C = _BV(USBS0) | _BV(UCSZ00);
+    /* Set USART Control and Status Register n C */
+    /* Asynchronous USART 8-bit data, No parity, 1 stop */
+    /* Set USART Mode Select: UMSELn1 UMSELn0 = 00 for Asynchronous USART */
+    /* Set Parity Mode:  UPMn1 UPMn0 = 00 for Parity Disabled */
+    /* Set Stop Bit Select: USBSn = 0 for 1 stop bit */
+    /* Set Character Size: UCSZn2 UCSZn1 UCSZn0 = 011 for 8-bit */
+    /* Clock Polarity: UCPOLn = 0 when asynchronous mode is used. */
+    UCSR0C = _BV(UCSZ01) | _BV(UCSZ00);
+    /* Clear Power Reduction USART0 */
+    BIT_CLEAR(PRR,PRUSART0);
 
     return;
 }
@@ -131,13 +139,14 @@ void RS485_Send_Frame(
         UDR0 = *buffer;
         buffer++;
         nbytes--;
-        /* per MSTP spec */
-        if (mstp_port) {
-            mstp_port->SilenceTimer = 0;
-        }
     }
-    while (!BIT_CHECK(UCSR0A,UDRE0)) {
-        /* do nothing - wait until Tx buffer is empty */
+    while (!BIT_CHECK(UCSR0A,TXC0)) {
+        /* do nothing - wait until the entire frame in the 
+           Transmit Shift Register has been shifted out */
+    }
+    /* per MSTP spec */
+    if (mstp_port) {
+        mstp_port->SilenceTimer = 0;
     }
 
     return;
@@ -151,8 +160,16 @@ void RS485_Check_UART_Data(struct mstp_port_struct_t *mstp_port)
     }
     /* wait for state machine to read from the DataRegister */
     else if (mstp_port->DataAvailable == false) {
+        /* check for error */
+        if (BIT_CHECK(UCSR0A,FE0)) {
+            mstp_port->ReceiveError = true;
+        }
+
+        if (BIT_CHECK(UCSR0A,DOR0)) {
+            mstp_port->ReceiveError = true;
+        }
         /* check for data */
-        if (!BIT_CHECK(UCSR0A,RXC0)) {
+        if (BIT_CHECK(UCSR0A,RXC0)) {
             mstp_port->DataRegister = UDR0;
             mstp_port->DataAvailable = true;
         }
diff --git a/bacnet-stack/ports/atmega168/timer.c b/bacnet-stack/ports/atmega168/timer.c
index 63469c54..c4c6d572 100644
--- a/bacnet-stack/ports/atmega168/timer.c
+++ b/bacnet-stack/ports/atmega168/timer.c
@@ -46,6 +46,8 @@ void timer_initialize(void)
     TCNT1 = TIMER_1_COUNT;
     /* Enable the overflow interrupt */
     BIT_SET(TIMSK1,TOIE1);
+    /* Clear the Power Reduction Timer/Counter0 */
+    BIT_CLEAR(PRR,PRTIM1);
 }