some mm stuff fixed