Tutor and Slot now can match to two things

Also fixed Matcher