Progress on MM, small fixes