Makefile: update coincidence rules
Update more rules, get specific for different sets