Some updates for clarity and newer versions of cfengine