Moved defines to globals, and updated

Moved the list processing defines to Globals - so all can use them -
and updated the globals to some extent.