Just changing some 'cat()' to 'message()' so it can be suppressed if desired.