Slowly increase the amount of recognized expressions

- also update the DSL syntax as I go
Clean up procedure names