Fixed identifiers in grammar; space after strings.
Added type, const, and simple var declarations to grammar; added while loop.