tweaking regex, which are dumb, albeit usefule ... sometimes