Message improvements and new debug option