fixed up message variables a bit