Fix parsing in read_block
Add code to cleanup read buffer slop