make parsing of DS arguments more robust and give more sensible