vac: major cleanup and bug fixes
8 files changed