rm commented out relabelP; updated lFmap and lAp comments