Vulpix storage

Some cleanup and fixes to allow the vulpix scripts to be run and tested.