Minor updates
Replacing dsl with dsl2.
Cleanup and testing - DSL usages are mostly broken right now.