regenerated most files; attempted cleanup of m.para.content