Fixed wording issues around blocks
Fixed accidential merge conflict