sarahatwork chore: Screen/Matcher improvements