Added Blocks.
Small fixes.