Node regex

...sts, some refactoring to clean up.  Fixes #8 #11.