Mrow normalizer fixes

related to #24 and #23