Typo/formatting fixes (M to R) plus some routing