Add variables related to QBID and bring adjacent income variables into compliance with standards

[baogorek]

QBID needs new income source variables, but existing income sources nearby are stacked 4 deep in the same file, etc. They should be brought out. References should be added.

This issue, when completed, will set up improvements to QBID logic.