add validations and more link types, with limited success