doc and minor regexp fix.