Fix another bug, slim down iterations of m2s