new dsl and bug fixes