fixing a couple message bugs