Mf updates

@syamp @postster please review