DOJO, some refactorings in the grammar, and adding 'expectation, action item, feedback' support