Add loop control and reserved words
Add import statement
Add true/false/none, and make rule names pretty