Comment fixes and fix context menu appearance on flagging a location already uncovered.