fixes, new version of regexp-string-mapper