Butt-load of minor changes to messaging.