updates to regex

thanks @psychobunny. ;) (If it works, I'll edit this if not!)