Rewritten unfolding+efficiency, output part, uncertainty handling