Updated lists and combining logic; added keywords