More Variable Definitions changes, progScanner overhaul