updated message stuff. This should hopefully be good-to-go