Fixed some annoyances with the output to Layout.  Curves and bends come in more cleanly now, and fixed a bug for the combined (single part) output.