complete DSA support
fix DSA merging conflicts