better mapper stregies and bugfixes