Recipient variables added for Messages. Minor updates.