Some output design improvements.