Fixes + rules + terms