Map type switch, french translation and bugfixes