further link fixes and validation updates