more DSL template clean up, fixes in templates