Separate terminals for numbers and identifiers
Added a lot of debug information for grammar / productions