Various improvements for vft-demo

Reviewer: @yotamhc @vaterlaus