update model with derivative and subject
rename indicators and adapt demo and aggregators
clean code