DA builder works; and a few other misc changes
DA builder works; and a few other misc changes