Output messages improved