Fixing Graph (spaces in properties + enlarging)