SUSYSSDL, tstrings to std::strings, tidying up, relabeling
merge C&M code
finish merging between C.H. and M.M. MPAF versions