matched/nomatched swap + few small corrections