fixed DSL templates, added some JavaDoc, updated demo model