Small updates and fixes

[markus-nilsson]

Thanks for contributing! Incorporated most of the proposals, except those concerning the change of how mfs_fn is conceived.