more variables for #989 + make them configurable