bootstrap: m_n_2 and m_n_x parts

I've just plugged in the old choices/marks matrix thing for m_n_x. I'll have another look at it later.