fixing up message bugs