Dartgun tweaks, vials.
Merge pull request #3142 from Zuhayr/feature

Dartgun tweaks, vials.