some more DSL improvements & data dumper