Minor edits.
Added partial Vault support for chat.