many DSL improvements!