privatize regex
stricter regex
module: update to template

Corrects the readme a bit
tests: update for c4374a & cleanup from c8ff5d0