fix m
more message tweaks