updated to parse and fix variables that contain dashes