add comments and number matching