Lap.map: improvements