Lots of Fixes in n.m.block.