finished match fully

included default values and added new fields.