Bug fix: Shutdown was not happening properly if num2Discard was set.

A couple random other output related changes.