DM and some fixes