Make output messages more consistent and fix some minor formatting issues
11 files changed