More work on desert map and jumping out of water.