add matches and entries, touch up some tests