fix typos, move the vault methods into a handler, private vault variables