reworked modifier tracking, added tracking of abstract modifier