Vault Fixes

Optimizations and Fixes for Vault Hunters