minor fixes, single output generation