New functionality for numbers and identifiers.
Implementation changes for numbers and identifiers.
Fixed number and identifier problems and tests.