README fixes ; map() matching extension ; more unit tests