ds composite cleanup, and additions.