vapour optimizations and tweaks
Merge pull request #3215 from masterbee/hotfix-vapour

Vapour reworking and streamlining