add link field and small fixes