Add HH 6ed tags to multivariable problems, a few bug fixes