small blocks

small blocks and other fixes