Better Vault handling. Also cleanup