Matching scores! And bugfixing