fix missing comma
handle yobs; use contains rather than equals; more generalisation
generalise yob comparisons