Added debugging
Updated match file