Minor text updates; More flexible matching system;