@@ -1,10 +1,11 @@
 // Package predictor implements the predictor compression/decompression algorithm
 // as specified by RFC1978 - PPP Predictor Compression Protocol
 package predictor
 
 import (
+	bits "0dev.org/bits"
 	"io"
 )
 
 type context struct {
 	table [1 << 16]byte
@@ -70,11 +71,10 @@
 			// ... and stage the rest of the data in the buffer
 			ctx.input = append(ctx.input, data[blockSize-bufferLength:]...)
 			return nil
 		}
 
-		// TODO allocate this on ctx.buffer ...
 		var buf []byte = make([]byte, 1, blockSize+1)
 		for block := 0; block < len(data)/blockSize; block++ {
 			for i := 0; i < blockSize; i++ {
 				var current byte = data[(block*blockSize)+i]
 				if ctx.table[ctx.hash] == current {
@@ -117,19 +117,19 @@
 	return r(output)
 }
 
 // Returns an io.Reader implementation that wraps the provided io.Reader
 // and decompresses data according to the predictor algorithm
-func Decompressor(wrapped io.Reader) io.Reader {
+func Decompressor(reader io.Reader) io.Reader {
 	var ctx context
 	ctx.input = make([]byte, 0, 8)
 
 	return decompressor(func(output []byte) (int, error) {
 		var (
-			err       error
-			flags     byte
-			readCount int
+			err                  error
+			flags                byte
+			readCount, available int
 		)
 
 		// Sanity check for space to read into
 		if len(output) == 0 {
 			return 0, nil
@@ -144,56 +144,68 @@
 				ctx.input = ctx.input[:copy(ctx.input, ctx.input[readCount:])]
 			}
 			return readCount, nil
 		}
 
-		// This is single-iteration only but it is fine according to io.Reader's contract ?!
-		// TODO - read all bytes from a block based on the hamming weight of the flag
-		// and just shuffle them for predictions instead of bite-sized reads ;)
-
-		// Read the flags
-		readCount, err = wrapped.Read(ctx.input[:1])
-		if readCount == 0 || err != nil {
-			return readCount, err
+		// Read the next prediction header
+		readCount, err = reader.Read(ctx.input[:1])
+		// Fail on error unless it is EOF
+		if err != nil && err != io.EOF {
+			return 0, err
+		} else if readCount == 0 {
+			return 0, err
 		}
 
+		// Extend the buffer, copy the prediction header
+		//  and calculate the number of subsequent bytes to read
 		ctx.input = ctx.input[:8]
 		flags = ctx.input[0]
-
-		var i uint = 0
-		for ; i < 8; i++ {
-			if flags&(1<<i) > 0 {
-				// Guess was right
-				ctx.input[i] = ctx.table[ctx.hash]
-			} else {
-				readCount, err = wrapped.Read(ctx.input[i:(i + 1)])
-
-				if err == io.EOF {
-					break
-				}
-
-				if err != nil {
-					return readCount, err
-				}
-
-				if readCount == 0 { // treat as EoF
-					break
-				}
-
+		available = 8 - int(bits.Hamming(flags))
+
+		// Read the non-predicted bytes according to header.
+		readCount, err = reader.Read(ctx.input[:available])
+	retryData:
+		if readCount < int(available) && err == nil {
+			// Retry the read if we have fewer bytes than what the prediction header indicates
+			var rc int
+			rc, err = reader.Read(ctx.input[readCount:available])
+			readCount += rc
+			goto retryData
+		} // Continue on any error, try to decompress and return it along the result
+
+		// Spread the read bytes right to left to avoid overlapping
+		for i, a := 7, available-1; i >= 0; i-- {
+			if ((flags >> uint(i)) & 1) == 0 {
+				ctx.input[i] = ctx.input[a]
+				a--
+			}
+		}
+
+		// Walk the buffer, fill in the predicted blanks and update the guess table
+		for i := uint(0); i < 8; i++ {
+			if (flags & (1 << i)) > 0 {
+				// Guess succeeded, fill in from the table
+				ctx.input[i] = ctx.table[ctx.hash]
+				readCount++
+			} else {
+				// Guess failed, update the table
 				ctx.table[ctx.hash] = ctx.input[i]
 			}
-
+			// Update the hash
 			ctx.hash = (ctx.hash << 4) ^ uint16(ctx.input[i])
 		}
 
-		readCount = copy(output, ctx.input[:i])
+		// readCount now contains the precise amount of populated data
+		ctx.input = ctx.input[:readCount]
+		available = copy(output, ctx.input)
 
-		// Place any remaining bytes in the buffer
-		if uint(readCount) < i {
-			ctx.input = ctx.input[readCount:i]
+		// Check for remaining bytes that dont fit in the output buffer
+		if available < readCount {
+			ctx.input = ctx.input[:copy(ctx.input, ctx.input[available:])]
 		} else {
+			// Clear the buffer
 			ctx.input = ctx.input[:0]
 		}
 
-		return readCount, nil
+		return available, err
 	})
 }