Map chooser, a lot of fixes