additional mm/mo/router bugfixes & features