Metafun enhancements (support for Espresso Navigator, bugfix, more "standard" conform)

additional bugfixes