Few block fixes/tweaks, added missing blocks.