fix spaces;
fix maps;