some basic changes to Match Entry