minor tweaks for the messages