Vault and other improvements

Passing along a bunch of updates I've made. You can feel free to review and accept, otherwise it would be helpful to create a develop branch on your side for pulling changes before they go into master.

John