Fixed zero block handling somewhat. Problem with zero blocks at end of buffer remains. Optimizations disabled due to problems with some datasets. Segment size clamped to 8 for now