Further updates including naive DSLs and other things...