Adds domains and additional information for CHQ variables
Also adds additional variables to have -1 options scrubbed out