Some fine tuning and plumbing for the Edit VG mode