working on #130 and fixes for ds2ds