Working out some old creases in the regex portion of the script
Cleaned up the argparsing