remove commented out code
Minor edit of comments
better maps for 'x and 'c, new maps for 'X and 'C