Fixed bugs, tested up to the Matcher