Latest changes

Specificity and other improvements