Added and tweaked some messages.