Merge Tom's links and fix widowFix.