Improvements for future MML3 and TMoTB2