Minor package, docco and regex changes.