Mf updates

@syamp @postster please review
nit: spacing