more DS integration, not yet connected
simple DS test passes
fix a few DS bugs