change 32 into block_size

few changes