more work on fixing links