Fixed some matches. Comments on regex.