added better usage, made all fwrule(id), machine, fwrule_id, etc... consistent (entity_id)