• Initial work on improving error reporting (catching parser exceptions). • Some refactoring and rationalisation of the grammar.