Fixed all the blocks and stuffs