fixed DM method & minor touch ups