Start updating vcl(7) for 4.0
Various fixes

Spelling. While here also fix indentation and make sure we are using
the right name for the variables and not the backward compat ones.