tweaks in message functions