Rules adjustments and additions

TODO