Add map and fix speakers