output formatting feature improved, and applied to more cases;