Reviewer requested changes to message strings and config order.