and test that they work for H1

To @Dridi, I would appreciate if you could have another look at s10.vtc.
I *tried* to keep your good ideas intact, and hope you can live with
these changes.