2 files changed, 8 insertions, 4 deletions

diff --git a/src/client.cpp b/src/client.cpp
index dc91e4b..7332abc 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -63,8 +63,11 @@ void Bu::Client::processOutput()
 {
         if( sWriteBuf.getSize() > 0 )
         {
-                pSocket->write( sWriteBuf.getStr(), sWriteBuf.getSize() );
-                sWriteBuf.clear();
+                int nAmnt = (sWriteBuf.getSize()<2048)?(sWriteBuf.getSize()):(2048);
+                printf("Transmitting %d of %ld bytes.\n", nAmnt, sWriteBuf.getSize() );
+                pSocket->write( sWriteBuf.getStr(), nAmnt );
+                sWriteBuf.trimFront( nAmnt );
+                //sWriteBuf.clear();
         }
 }
 
diff --git a/src/hash.h b/src/hash.h
index f183823..36665a6 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -856,7 +856,8 @@ namespace Bu
 
                         // First we scan to see if the key is already there, abort if we
                         // run out of probing room, or we find a non-filled entry
-                        for( int8_t j = 0;
+                        int8_t j;
+                        for( j = 0;
                                 isFilled( nCur ) && j < 32;
                                 nCur = (nCur + (1<<j))%nCapacity, j++
                                 )
@@ -880,7 +881,7 @@ namespace Bu
 
                         // This is our insurance, if the table is full, then go ahead and
                         // rehash, then try again.
-                        if( isFilled( nCur ) && rehash == true )
+                        if( (isFilled( nCur ) || j == 32) && rehash == true )
                         {
                                 reHash( szCalc(getCapacity(), getFill(), getDeleted()) );