match enhancements

moving forward on match states