Some minor changes to improve communication to the user.