Added couple of blocks, fixed a bug