Seperate composable and non composable blocks
Some bugfixes in basic block