improving support for mobile, suggestions by @lokal-profil