fixes to qi's when x1 not defined, and to qi labels