Minor changes
Make the map choice more random