Modify truthy rule, elaborate state change, fix others