Multiblocks WIP and some fixes