a few messaging improvements