Minor messaging and client changes