DSL Tweaks

Various tweaks to the DSL, including features from #27 

cc: @schisamo @danielsdeleo @sdelano