Address review comments (fix docs, harden vdor validation fun)