DTE changes

A bunch of changes to the DTE branch.