fix some rules and add missing trash rules