structured output, and bugs fixed for MF