Fix error - replace hyphens for underscores in list's var. names
Add various changes. Make it work properly