Link editing and fixes