including Justin's fixes to the string message.