Better regular expression.
Include a description.
Fix a few more bugs.