Small changes to the grammar.
Some refactoring. Started working on the backend.