MSLDS changes from BayesMSM branch