All the final changes for DM. Mostly just bug stuff.