lap.map: polishing and fixing some details