map/caption edit

first pass