added MATCH VC and fixed minor bugs