added missing templates to output
added test option for unfolding
fixed plotting for non-merged case