Removed support for numbers as variable names and fixed quoted strings when calc symbols are in quotes